Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/models/credential.py b/planetstack/core/models/credential.py
index c7a04da..4b5518b 100644
--- a/planetstack/core/models/credential.py
+++ b/planetstack/core/models/credential.py
@@ -1,7 +1,7 @@
 import os
 from django.db import models
 from core.models import PlCoreBase
-from core.models import User,Site,Slice
+from core.models import User,Site,Slice,Deployment
 from encrypted_fields import EncryptedCharField
 
 class UserCredential(PlCoreBase):
@@ -36,3 +36,14 @@
 
     def __unicode__(self):
         return self.name
+
+class DeploymentCredential(PlCoreBase):
+    deployment = models.ForeignKey(Deployment, related_name='credentials', help_text="The User this credential is associated with")
+
+    name = models.SlugField(help_text="The credential type, e.g. ec2", max_length=128)
+    key_id = models.CharField(help_text="The backend id of this credential", max_length=1024)
+    enc_value = EncryptedCharField(help_text="The key value of this credential", max_length=1024)
+
+
+    def __unicode__(self):
+        return self.name