diff options
| author | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-05-08 17:55:32 +0800 |
|---|---|---|
| committer | ChangBo Guo(gcb) <eric.guo@easystack.cn> | 2017-05-08 17:55:32 +0800 |
| commit | 381a84a4e8e3a57ac26c3796cb51ba502be351bf (patch) | |
| tree | 2f56eb72481297fd1ddce088c12abe1cf715332e /contrib | |
| parent | a13ba93777996584a522083348dba465906b99cc (diff) | |
| download | heat-381a84a4e8e3a57ac26c3796cb51ba502be351bf.tar.gz | |
Remove usage of parameter enforce_type
Oslo.config deprecated parameter enforce_type and change its default
value to True in Ifa552de0a994e40388cbc9f7dbaa55700ca276b0. Remove
the usage of it to avoid DeprecationWarning: "Using the 'enforce_type'
argument is deprecated in version '4.0' and will be removed in version
'5.0': The argument enforce_type has changed its default value to True
and then will be removed completely."
Change-Id: I91b0f0a52b5ce8654702510eed76d5dea8cc8fe4
Related--Bug: #1517839
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, 5 insertions, 6 deletions
diff --git a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py index 1b680ce40..f66438ec1 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', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_user', 'heat', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_password', 'verybadpass', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_tenant_name', 'service', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') 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 941b1f6f0..96877f3d5 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -64,8 +64,7 @@ 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', - enforce_type=True) + cfg.CONF.set_override('region_name_for_services', 'RegionOne') self.ctx = utils.dummy_context() self.fc = fakes.FakeClient() |