openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Merge "Update amulet tests for new s3/ec2/nova username"

Browse Source
This commit is contained in:
Zuul 2018-01-05 09:26:22 +00:00 committed by Gerrit Code Review
commit 4a9209ea0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/basic_deployment.py
View File

@ -491,7 +491,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
'auth_protocol': 'http', 'auth_protocol': 'http',
'private-address': u.valid_ip, 'private-address': u.valid_ip,
'auth_host': u.valid_ip, 'auth_host': u.valid_ip,
'service_username': 's3_ec2_nova', 'service_username': 'ec2_nova_s3',
'service_tenant_id': u.not_null, 'service_tenant_id': u.not_null,
'service_host': u.valid_ip 'service_host': u.valid_ip
} }
@ -499,7 +499,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
expected['service_username'] = 'nova' expected['service_username'] = 'nova'
if self._get_openstack_release() >= self.xenial_ocata: if self._get_openstack_release() >= self.xenial_ocata:
expected['service_username'] = 'placement_nova' expected['service_username'] = 'nova_placement'
ret = u.validate_relation_data(unit, relation, expected) ret = u.validate_relation_data(unit, relation, expected)
if ret: if ret: