Merge 00cd37a into fe2dcd3

pkgcloud · Nov 7, 2015 · f428395 · f428395
2 parents fe2dcd3 + 00cd37a
commit f428395
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/pkgcloud/openstack/client.js b/lib/pkgcloud/openstack/client.js
@@ -89,6 +89,9 @@ Client.prototype._getIdentityOptions = function() {
   else if (this.config.tenantName) {
     options.tenantName = this.config.tenantName;
   }
+  if (this.config.userId) {
+    options.userId = this.config.userId;
+  }
   if (typeof this.config.useServiceCatalog === 'boolean') {
     options.useServiceCatalog = this.config.useServiceCatalog;
   }

diff --git a/lib/pkgcloud/openstack/context/identity.js b/lib/pkgcloud/openstack/context/identity.js
@@ -244,6 +244,17 @@ Identity.prototype._buildAuthenticationPayload = function () {
       }
     };
   }
+  else if (self.options.password && self.options.userId && self.options.tenantId) {
+    self._authenticationPayload = {
+        auth: {
+          tenantId: self.options.tenantId,
+          passwordCredentials: {
+            userId: self.options.userId,
+            password: self.options.password
+          }
+        }
+    };
+  }
   // Token and tenant are also valid inputs
   else if (self.options.token && (self.options.tenantId || self.options.tenantName)) {
     self._authenticationPayload = {