fog 1.34.0 → 1.35.0

data/lib/fog/openstack/requests/volume/get_quota_usage.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def get_quota_usage(tenant_id)
+          request(
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => "/os-quota-sets/#{tenant_id}?usage=True"
+          )
+        end
+      end
+
+      class Mock
+        def get_quota_usage(tenant_id)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'quota_set' => {
+              'gigabytes' => {
+                'reserved' => 0,
+                'limit'    => -1,
+                'in_use'   => 160
+              },
+              'snapshots' => {
+                'reserved' => 0,
+                'limit'    => 50,
+                'in_use'   => 3
+              },
+              'volumes' => {
+                'reserved' => 0,
+                'limit'    => 50,
+                'in_use'    => 5
+              },
+              'id' => tenant_id
+            }
+          }
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/volume/get_volume_type_details.rb

@@ -12,7 +12,7 @@ module Fog
       end
 
       class Mock
-        def get_volume_details(volume_type_id)
+        def get_volume_type_details(volume_type_id)
           response = Excon::Response.new
           response.status = 200
           response.body = {

data/lib/fog/openstack/requests/volume/update_volume_type.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Volume
+    class OpenStack
+      class Real
+        def update_volume_type(volume_type_id, options = {})
+          data = {
+            'volume_type' => {}
+          }
+
+          vanilla_options = [:name, :extra_specs]
+          vanilla_options.select { |o| options[o] }.each do |key|
+            data['volume_type'][key] = options[key]
+          end
+          request(
+            :body     => Fog::JSON.encode(data),
+            :expects  => [200, 202],
+            :method   => 'PUT',
+            :path     => "types/#{volume_type_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_volume_type(volume_type_id, options = {})
+          response = Excon::Response.new
+          response.status = 202
+          response.body = {
+            "volume_type"=> {
+              "id"=> "6685584b-1eac-4da6-b5c3-555430cf68ff",
+              "name"=> "vol-type-001",
+              "extra_specs"=> {
+                  "capabilities"=> "gpu"
+              }
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume.rb

@@ -41,6 +41,9 @@ module Fog
       request :list_zones
 
       request :list_volume_types
+      request :create_volume_type
+      request :update_volume_type
+      request :delete_volume_type
       request :get_volume_type_details
 
       request :create_volume_snapshot
@@ -60,6 +63,8 @@ module Fog
       request :get_quota
       request :get_quota_defaults
 
+      request :get_quota_usage
+
       request :set_tenant
 
       class Mock

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -153,6 +153,11 @@ module Fog
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
         attribute :boot_volume_id
 
+        # @!attribute [w] boot_volume_size
+        # @return [Integer] The Size of the boot volume to be created by the BlockStorage service.
+        # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
+        attribute :boot_volume_size
+
         # @!attribute [w] boot_image_id
         # @return [String] The ID of an image to create a bootable volume from.
         # @see http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot
@@ -264,6 +269,7 @@ module Fog
           modified_options[:key_name] ||= attributes[:key_name]
           modified_options[:boot_volume_id] ||= attributes[:boot_volume_id]
           modified_options[:boot_image_id] ||= attributes[:boot_image_id]
+          modified_options[:boot_volume_size] ||= attributes[:boot_volume_size]
 
           if modified_options[:networks]
             modified_options[:networks].map! { |id| { :uuid => id } }
@@ -619,7 +625,11 @@ module Fog
         end
 
         def password_lock
-          "passwd -l #{username}" unless attributes[:no_passwd_lock]
+          if !attributes[:no_passwd_lock].nil?
+            Fog::Logger.warning("Rackspace[:no_passwd_lock] is deprecated since it is now the default behavior, use Rackspace[:passwd_lock] instead")
+          end
+
+          "passwd -l #{username}" if attributes[:passwd_lock]
         end
 
         def user_data_encoded

data/lib/fog/rackspace/models/compute_v2/servers.rb

@@ -27,8 +27,8 @@ module Fog
         # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
         # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
         # @raise [Fog::Compute::RackspaceV2::ServiceError]
-        # @note This method is compatible with Cloud Servers utlizing RackConnect ***if and only if***
-        #       provided the attribute "no_passwd_lock" set to *true*.
+        # @note This method is incompatible with Cloud Servers utlizing RackConnect ***if and only if***
+        #       provided the attribute "passwd_lock" left at *false*.
         # @example
         #   service.servers.bootstrap :name => 'bootstrap-server',
         #                             :flavor_id => service.flavors.first.id,

data/lib/fog/rackspace/requests/compute_v2/create_server.rb

@@ -18,6 +18,7 @@ module Fog
         #   attachment of volumes to this server. Mutually exclusive with :volume_id or :volume_image_id. If provided, leave image_id
         #   as "". See http://developer.openstack.org/api-ref-compute-v2-ext.html#ext-os-block-device-mapping-v2-boot for details.
         # @option options [String] boot_volume_id Id of a pre-created bootable volume to use for this server. If provided, leave image_id as "".
+        # @option options [Integer] boot_volume_size Size of the bootable volume to be created expressed in GB. (defaults to 100)
         # @option options [String] boot_image_id Id of an image to create a bootable volume from and attach to this server. If provided,
         #   leave image_id as "".
         # @return [Excon::Response] response:
@@ -96,12 +97,16 @@ module Fog
                 Fog::Logger.warning(":boot_volume_id overrides :boot_image_id!")
               end
 
+              if options[:boot_volume_size]
+                Fog::Logger.warning("Boot volume size: " + options[:boot_volume_size] + "GB")
+              end
+
               data['server']['block_device_mapping_v2'] = [{
                 'boot_index' => '0',
                 'uuid' => options[:boot_volume_id],
                 'source_type' => 'volume',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
 
@@ -111,7 +116,7 @@ module Fog
                 'uuid' => options[:boot_image_id],
                 'source_type' => 'image',
                 'destination_type' => 'volume',
-                'volume_size' => 100
+                'volume_size' => options[:boot_volume_size] ? options[:boot_volume_size] : 100
               }]
             end
         end

data/lib/fog/vcloud_director/requests/compute/get_execute_query.rb

@@ -77,15 +77,18 @@ module Fog
               :path       => 'query'
             )
           else
-            query = ["type=#{type}"]
-            query << "sortAsc=#{options[:sortAsc]}" if options[:sortAsc]
-            query << "sortDesc=#{options[:sortDesc]}" if options[:sortDesc]
-            query << "page=#{options[:page]}" if options[:page]
-            query << "pageSize=#{options[:pageSize]}" if options[:pageSize]
-            query << "format=#{options[:format]}" if options[:format]
-            query << "fields=#{Array(options[:fields]).join(',')}" if options[:fields]
-            query << "offset=#{options[:offset]}" if options[:offset]
-            query << "filter=#{options[:filter]}" if options[:filter]
+            query = {
+              :type => type,
+            }
+
+            query[:sortAsc] = options[:sortAsc] if options[:sortAsc]
+            query[:sortDesc] = options[:sortDesc] if options[:sortDesc]
+            query[:page] = options[:page] if options[:page]
+            query[:pageSize] = options[:pageSize] if options[:pageSize]
+            query[:format] = options[:format] if options[:format]
+            query[:fields] = Array(options[:fields]).join(',') if options[:fields]
+            query[:offset] = options[:offset] if options[:offset]
+            query[:filter] = options[:filter] if options[:filter]
 
             response = request(
               :expects    => 200,
@@ -93,7 +96,7 @@ module Fog
               :method     => 'GET',
               :parser     => Fog::ToHashDocument.new,
               :path       => 'query',
-              :query      => query.map {|q| URI.escape(q)}.join('&')
+              :query      => query.map {|k, v| "#{k}=#{CGI.escape(v.to_s)}" }.join('&').gsub('%3D', '=').gsub('%3B', ';')
             )
             ensure_list! response.body, :Link
             # TODO: figure out the right key (this isn't it)

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.34.0'
+  VERSION = '1.35.0'
 end

data/lib/fog/vsphere/models/compute/server.rb

@@ -157,7 +157,7 @@ module Fog
         end
 
         def tools_running?
-          tools_state == "toolsOk"
+          ["toolsOk","toolsOld"].include? tools_state
         end
 
         # defines VNC attributes on the hypervisor

data/lib/tasks/changelog_task.rb

@@ -108,6 +108,7 @@ Watchers      | #{watchers}
            'Ash Wilson',
            'Benson Kalahar',
            'Brian Hartsock',
+           'bryanl',
            'Chris Luo',
            'Chris Roberts',
            'Christopher Oliver',

data/spec/fog/openstack/identity_v3/authv3_a.yml

@@ -5,10 +5,10 @@ http_interactions:
     uri: http://devstack.openstack.stack:5000/v3/auth/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","id":"aa9f25defa6d4cafb48466df83106065"}}},"scope":{"domain":{"id":"default"}}}}'
+      string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"devstack","id":"a18abc2039d6493aa7239a42033cc7c9"}}},"scope":{"domain":{"id":"default"}}}}'
     headers:
       User-Agent:
-      - fog/1.31.0 fog-core/1.31.1
+      - fog-core/1.32.1
       Content-Type:
       - application/json
   response:
@@ -17,65 +17,58 @@ http_interactions:
       message: ''
     headers:
       Date:
-      - Tue, 23 Jun 2015 15:09:13 GMT
+      - Fri, 02 Oct 2015 11:41:10 GMT
       Server:
       - Apache/2.4.7 (Ubuntu)
       X-Subject-Token:
-      - aa2d000e4f8a41a2ab6f5dcac7099f65
+      - 7837f4db3c874582b0f9e36020805cc4
       Vary:
       - X-Auth-Token
       X-Openstack-Request-Id:
-      - req-5a5a48d1-5bee-4526-bf9e-bb27525bcf9a
+      - req-41974054-62bc-4048-809c-d748734de047
       Content-Length:
-      - '3532'
+      - '3025'
       Content-Type:
       - application/json
     body:
-      encoding: US-ASCII
-      string: ! '{"token": {"domain": {"id": "default", "name": "Default"}, "methods":
-        ["password"], "roles": [{"id": "6ead57f8ae124996af8b0beb72ff1007", "name":
-        "admin"}], "expires_at": "2015-06-23T16:09:14.166804Z", "catalog": [{"endpoints":
-        [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "public", "id": "6e82c8912d3f49a09df51035681d564c"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "admin", "id": "7e44d321ae80457abc3728fa1e6feb32"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "internal", "id": "c9a090a4597040849c03bc13588167f6"}],
-        "type": "image", "id": "0d56500210a24c38a3702b6825e24164", "name": "glance"},
-        {"endpoints": [], "type": "volumev2", "id": "2b92e79c45254516932c633229cd0e8b",
-        "name": "cinderv2"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/",
-        "region": "RegionOne", "interface": "admin", "id": "1ce26a6fffd0424bac135b9c68055b6e"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region":
-        "RegionOne", "interface": "public", "id": "98db699b9ffa4dffb027d78163aad8cc"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region":
-        "RegionOne", "interface": "internal", "id": "ece52860cf1e4eb6a8fed05c47a30147"}],
-        "type": "ec2", "id": "3364a7b95c664bf89a7a8db081576364", "name": "ec2"}, {"endpoints":
-        [], "type": "volume", "id": "511b94ce0482484ea09028091dd5e9a5", "name": "cinder"},
-        {"endpoints": [], "type": "compute", "id": "5b7028751ed045d79467c7845ecb8c58",
-        "name": "nova"}, {"endpoints": [], "type": "computev21", "id": "97e665cbada043718180c5a6316df76a",
-        "name": "novav21"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3",
-        "region": "RegionOne", "interface": "admin", "id": "185eda94de9340e58245062f75d7f80e"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "internal", "id": "9abd6797844d455f875af9537325cba4"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "public", "id": "d3b31f24e4ea40699f731e29e625c187"}],
-        "type": "identity", "id": "b577d8f7c7074d04a1165fcca638b600", "name": "keystone_v3x"},
-        {"endpoints": [{"region_id": "europe", "url": "http://devstack.openstack.stack:35357/v3",
-        "region": "europe", "interface": "admin", "id": "32bb2c6aea944ea6b4956eb24142d2e2"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "public", "id": "480ea71dc8cf4c959df1c6304be87056"},
-        {"region_id": "europe", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "europe", "interface": "public", "id": "600638643d22494fad4f30e3b22ae124"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "internal", "id": "8a254651925e4a3e9505c863a00c017e"},
-        {"region_id": "europe", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "europe", "interface": "internal", "id": "b93da6aaba654d8cb451ff8378d7d2a5"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", "region":
-        "RegionOne", "interface": "admin", "id": "d5f8e0da0f3345529a5fb324d735d4a3"}],
-        "type": "identity_v3", "id": "cd9002bbadfe495d81b5ee4c50768009", "name": "keystone_v3"}],
-        "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id":
-        "aa9f25defa6d4cafb48466df83106065", "name": "admin"}, "audit_ids": ["D9doa9rPSoO-bPw9mbsjyw"],
-        "issued_at": "2015-06-23T15:09:14.166855Z"}}'
+      encoding: UTF-8
+      string: '{"token": {"domain": {"id": "default", "name": "Default"}, "methods":
+        ["password"], "roles": [{"id": "d98e5f87050646f194c8c23b9e3f2bca", "name":
+        "admin"}], "expires_at": "2015-10-02T12:41:10.799897Z", "catalog": [{"endpoints":
+        [{"region_id": "RegionOne", "url": "http://10.97.17.84:5000/v3", "region":
+        "RegionOne", "interface": "public", "id": "09bb76485f3849c1a81dfeda62f1b27b"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:35357/v3", "region":
+        "RegionOne", "interface": "admin", "id": "73acd28dc39e4d2cb332fe63eafd05fa"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:5000/v3", "region":
+        "RegionOne", "interface": "internal", "id": "c0acc2a6600148248912d585cfd3debf"}],
+        "type": "identity", "id": "00707ec9c3574d8ebb638265844f7903", "name": "keystone"},
+        {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:9292",
+        "region": "RegionOne", "interface": "admin", "id": "9799d84417464a4cbb9226485ce539c7"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:9292", "region": "RegionOne",
+        "interface": "internal", "id": "a0d9872cbf42461ea5ab511d32387662"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:9292", "region": "RegionOne", "interface":
+        "public", "id": "a93b60395e044b9187ccd7b37cf0c68c"}], "type": "image", "id":
+        "1f1c2c6373754553938a93de04db5bc0", "name": "glance"}, {"endpoints": [], "type":
+        "volumev2", "id": "49ef74e8dab84ed0b683f764ae6d510c", "name": "cinderv2"},
+        {"endpoints": [], "type": "volume", "id": "54efbe90e47244eca5fac1a65374e594",
+        "name": "cinder"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:9696/",
+        "region": "RegionOne", "interface": "public", "id": "59f19d0e7c59457fa611c4f552fa37c3"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:9696/", "region": "RegionOne",
+        "interface": "admin", "id": "5f2d351a942e41bc8cc2163569c645b7"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:9696/", "region": "RegionOne", "interface":
+        "internal", "id": "8e2b48e33993420b934607375242e6a1"}], "type": "network",
+        "id": "b6063de99a3b474094779d6f778cd87b", "name": "neutron"}, {"endpoints":
+        [], "type": "computev21", "id": "c6ad05da1baa4dd190bdf01dca60e911", "name":
+        "novav21"}, {"endpoints": [], "type": "compute", "id": "d22c9f37ebea4187ae97eb57ced02483",
+        "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:8773/",
+        "region": "RegionOne", "interface": "admin", "id": "d0af6d9e8b304d69bc349b63fdb7bd00"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:8773/", "region": "RegionOne",
+        "interface": "public", "id": "e08749c48e9e4d2c9f2733fa221b3b2f"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:8773/", "region": "RegionOne", "interface":
+        "internal", "id": "faf1491ad0244c17b13f9b4fc10becbb"}], "type": "ec2", "id":
+        "e2550fc44d8044398e49a080439462ed", "name": "ec2"}], "extras": {}, "user":
+        {"domain": {"id": "default", "name": "Default"}, "id": "a18abc2039d6493aa7239a42033cc7c9",
+        "name": "admin"}, "audit_ids": ["Lstac4lTRaaXJDd1gA_BQg"], "issued_at": "2015-10-02T11:41:10.799948Z"}}'
     http_version: 
-  recorded_at: Tue, 23 Jun 2015 15:09:14 GMT
+  recorded_at: Fri, 02 Oct 2015 11:40:58 GMT
 recorded_with: VCR 2.9.3

data/spec/fog/openstack/identity_v3/authv3_b.yml

@@ -5,10 +5,10 @@ http_interactions:
     uri: http://devstack.openstack.stack:5000/v3/auth/tokens
     body:
       encoding: UTF-8
-      string: ! '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"id":"default"},"name":"admin"}}},"scope":{"domain":{"id":"default"}}}}'
+      string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"devstack","domain":{"id":"default"},"name":"admin"}}},"scope":{"domain":{"id":"default"}}}}'
     headers:
       User-Agent:
-      - fog/1.31.0 fog-core/1.31.1
+      - fog-core/1.32.1
       Content-Type:
       - application/json
   response:
@@ -17,65 +17,58 @@ http_interactions:
       message: ''
     headers:
       Date:
-      - Tue, 23 Jun 2015 15:09:14 GMT
+      - Fri, 02 Oct 2015 11:41:11 GMT
       Server:
       - Apache/2.4.7 (Ubuntu)
       X-Subject-Token:
-      - b578d2c108144a3b9d62ec94625e731e
+      - 4932531d8be74a31a991b3ae70716832
       Vary:
       - X-Auth-Token
       X-Openstack-Request-Id:
-      - req-db30eb45-f3a1-4411-af7f-4d22318e81e5
+      - req-52ff8747-b15b-46bc-b985-6fdf5df22c2f
       Content-Length:
-      - '3532'
+      - '3025'
       Content-Type:
       - application/json
     body:
-      encoding: US-ASCII
-      string: ! '{"token": {"domain": {"id": "default", "name": "Default"}, "methods":
-        ["password"], "roles": [{"id": "6ead57f8ae124996af8b0beb72ff1007", "name":
-        "admin"}], "expires_at": "2015-06-23T16:09:14.388398Z", "catalog": [{"endpoints":
-        [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "public", "id": "6e82c8912d3f49a09df51035681d564c"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "admin", "id": "7e44d321ae80457abc3728fa1e6feb32"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region":
-        "RegionOne", "interface": "internal", "id": "c9a090a4597040849c03bc13588167f6"}],
-        "type": "image", "id": "0d56500210a24c38a3702b6825e24164", "name": "glance"},
-        {"endpoints": [], "type": "volumev2", "id": "2b92e79c45254516932c633229cd0e8b",
-        "name": "cinderv2"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/",
-        "region": "RegionOne", "interface": "admin", "id": "1ce26a6fffd0424bac135b9c68055b6e"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region":
-        "RegionOne", "interface": "public", "id": "98db699b9ffa4dffb027d78163aad8cc"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region":
-        "RegionOne", "interface": "internal", "id": "ece52860cf1e4eb6a8fed05c47a30147"}],
-        "type": "ec2", "id": "3364a7b95c664bf89a7a8db081576364", "name": "ec2"}, {"endpoints":
-        [], "type": "volume", "id": "511b94ce0482484ea09028091dd5e9a5", "name": "cinder"},
-        {"endpoints": [], "type": "compute", "id": "5b7028751ed045d79467c7845ecb8c58",
-        "name": "nova"}, {"endpoints": [], "type": "computev21", "id": "97e665cbada043718180c5a6316df76a",
-        "name": "novav21"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3",
-        "region": "RegionOne", "interface": "admin", "id": "185eda94de9340e58245062f75d7f80e"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "internal", "id": "9abd6797844d455f875af9537325cba4"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "public", "id": "d3b31f24e4ea40699f731e29e625c187"}],
-        "type": "identity", "id": "b577d8f7c7074d04a1165fcca638b600", "name": "keystone_v3x"},
-        {"endpoints": [{"region_id": "europe", "url": "http://devstack.openstack.stack:35357/v3",
-        "region": "europe", "interface": "admin", "id": "32bb2c6aea944ea6b4956eb24142d2e2"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "public", "id": "480ea71dc8cf4c959df1c6304be87056"},
-        {"region_id": "europe", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "europe", "interface": "public", "id": "600638643d22494fad4f30e3b22ae124"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "RegionOne", "interface": "internal", "id": "8a254651925e4a3e9505c863a00c017e"},
-        {"region_id": "europe", "url": "http://devstack.openstack.stack:5000/v3", "region":
-        "europe", "interface": "internal", "id": "b93da6aaba654d8cb451ff8378d7d2a5"},
-        {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", "region":
-        "RegionOne", "interface": "admin", "id": "d5f8e0da0f3345529a5fb324d735d4a3"}],
-        "type": "identity_v3", "id": "cd9002bbadfe495d81b5ee4c50768009", "name": "keystone_v3"}],
-        "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id":
-        "aa9f25defa6d4cafb48466df83106065", "name": "admin"}, "audit_ids": ["glPwaJIQQ_iD7DJHWUgcNw"],
-        "issued_at": "2015-06-23T15:09:14.388453Z"}}'
+      encoding: UTF-8
+      string: '{"token": {"domain": {"id": "default", "name": "Default"}, "methods":
+        ["password"], "roles": [{"id": "d98e5f87050646f194c8c23b9e3f2bca", "name":
+        "admin"}], "expires_at": "2015-10-02T12:41:11.168019Z", "catalog": [{"endpoints":
+        [{"region_id": "RegionOne", "url": "http://10.97.17.84:5000/v3", "region":
+        "RegionOne", "interface": "public", "id": "09bb76485f3849c1a81dfeda62f1b27b"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:35357/v3", "region":
+        "RegionOne", "interface": "admin", "id": "73acd28dc39e4d2cb332fe63eafd05fa"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:5000/v3", "region":
+        "RegionOne", "interface": "internal", "id": "c0acc2a6600148248912d585cfd3debf"}],
+        "type": "identity", "id": "00707ec9c3574d8ebb638265844f7903", "name": "keystone"},
+        {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:9292",
+        "region": "RegionOne", "interface": "admin", "id": "9799d84417464a4cbb9226485ce539c7"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:9292", "region": "RegionOne",
+        "interface": "internal", "id": "a0d9872cbf42461ea5ab511d32387662"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:9292", "region": "RegionOne", "interface":
+        "public", "id": "a93b60395e044b9187ccd7b37cf0c68c"}], "type": "image", "id":
+        "1f1c2c6373754553938a93de04db5bc0", "name": "glance"}, {"endpoints": [], "type":
+        "volumev2", "id": "49ef74e8dab84ed0b683f764ae6d510c", "name": "cinderv2"},
+        {"endpoints": [], "type": "volume", "id": "54efbe90e47244eca5fac1a65374e594",
+        "name": "cinder"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:9696/",
+        "region": "RegionOne", "interface": "public", "id": "59f19d0e7c59457fa611c4f552fa37c3"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:9696/", "region": "RegionOne",
+        "interface": "admin", "id": "5f2d351a942e41bc8cc2163569c645b7"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:9696/", "region": "RegionOne", "interface":
+        "internal", "id": "8e2b48e33993420b934607375242e6a1"}], "type": "network",
+        "id": "b6063de99a3b474094779d6f778cd87b", "name": "neutron"}, {"endpoints":
+        [], "type": "computev21", "id": "c6ad05da1baa4dd190bdf01dca60e911", "name":
+        "novav21"}, {"endpoints": [], "type": "compute", "id": "d22c9f37ebea4187ae97eb57ced02483",
+        "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://10.97.17.84:8773/",
+        "region": "RegionOne", "interface": "admin", "id": "d0af6d9e8b304d69bc349b63fdb7bd00"},
+        {"region_id": "RegionOne", "url": "http://10.97.17.84:8773/", "region": "RegionOne",
+        "interface": "public", "id": "e08749c48e9e4d2c9f2733fa221b3b2f"}, {"region_id":
+        "RegionOne", "url": "http://10.97.17.84:8773/", "region": "RegionOne", "interface":
+        "internal", "id": "faf1491ad0244c17b13f9b4fc10becbb"}], "type": "ec2", "id":
+        "e2550fc44d8044398e49a080439462ed", "name": "ec2"}], "extras": {}, "user":
+        {"domain": {"id": "default", "name": "Default"}, "id": "a18abc2039d6493aa7239a42033cc7c9",
+        "name": "admin"}, "audit_ids": ["0-LDEwlRSzOugOF8puxsyg"], "issued_at": "2015-10-02T11:41:11.168089Z"}}'
     http_version: 
-  recorded_at: Tue, 23 Jun 2015 15:09:14 GMT
+  recorded_at: Fri, 02 Oct 2015 11:40:59 GMT
 recorded_with: VCR 2.9.3