Update amulet tests for new s3/ec2/nova username
Keystone now orders the elements of the username when constructing a username for multiple services. Update amulet to expect the new username (only actually affects icehouse). Change-Id: I6ac49b0a2782df2ebc8f3d1fe299dec3cc078d7c Closes-Bug: #1739409 Depends-On: I0f857d7c2d5c4abf4843bc3fe1a9848164048fe2
This commit is contained in:
parent
5c79af1bd1
commit
c837c1412f
@ -491,7 +491,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
|
||||
'auth_protocol': 'http',
|
||||
'private-address': 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_host': u.valid_ip
|
||||
}
|
||||
@ -499,7 +499,7 @@ class NovaCCBasicDeployment(OpenStackAmuletDeployment):
|
||||
expected['service_username'] = 'nova'
|
||||
|
||||
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)
|
||||
if ret:
|
||||
|
Loading…
x
Reference in New Issue
Block a user