diff options
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py | 8 | ||||
-rw-r--r-- | contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py index f66438ec1..1b680ce40 100644 --- a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py +++ b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py @@ -36,13 +36,13 @@ class KeystoneClientTest(common.HeatTestCase): dummy_url = 'http://server.test:5000/v2.0' cfg.CONF.set_override('auth_uri', dummy_url, - group='keystone_authtoken') + group='keystone_authtoken', enforce_type=True) cfg.CONF.set_override('admin_user', 'heat', - group='keystone_authtoken') + group='keystone_authtoken', enforce_type=True) cfg.CONF.set_override('admin_password', 'verybadpass', - group='keystone_authtoken') + group='keystone_authtoken', enforce_type=True) cfg.CONF.set_override('admin_tenant_name', 'service', - group='keystone_authtoken') + group='keystone_authtoken', enforce_type=True) self.addCleanup(self.m.VerifyAll) def _stubs_v2(self, method='token', auth_ok=True, trust_scoped=True, diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py index d7f1828a0..5cb1bb855 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -64,7 +64,8 @@ cfg.CONF.import_opt('region_name_for_services', 'heat.common.config') class CloudServersTest(common.HeatTestCase): def setUp(self): super(CloudServersTest, self).setUp() - cfg.CONF.set_override('region_name_for_services', 'RegionOne') + cfg.CONF.set_override('region_name_for_services', 'RegionOne', + enforce_type=True) self.ctx = utils.dummy_context() self.fc = fakes.FakeClient() |