openstack/charm-neutron-gateway
Code Issues Proposed changes

Fixup checks for neutron section in nova.conf

Browse Source
This commit is contained in:
James Page 2016-02-17 10:14:53 +00:00
parent 3bc0cb88d0
commit 49e7ba7f82
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/basic_deployment.py
View File

@ -878,16 +878,29 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
expected['oslo_concurrency'] = {
'lock_path': '/var/lock/nova'
}
expected['neutron'] = {
'auth_strategy': 'keystone',
'url': nova_cc_relation['quantum_url'],
'admin_tenant_name': 'services',
'admin_username': 'nova',
'admin_password': nova_cc_relation['service_password'],
'admin_auth_url': ep,
'service_metadata_proxy': 'True',
'metadata_proxy_shared_secret': u.not_null
}
if self._get_openstack_release() >= self.trusty_mitaka:
expected['neutron'] = {
'url': nova_cc_relation['quantum_url'],
'auth_plugin': 'password',
'project_name': 'services',
'username': 'nova',
'password': nova_cc_relation['service_password'],
'auth_url': ep,
'region': 'RegionOne',
'service_metadata_proxy': 'True',
'metadata_proxy_shared_secret': u.not_null
}
else:
expected['neutron'] = {
'auth_strategy': 'keystone',
'url': nova_cc_relation['quantum_url'],
'admin_tenant_name': 'services',
'admin_username': 'nova',
'admin_password': nova_cc_relation['service_password'],
'admin_auth_url': ep,
'service_metadata_proxy': 'True',
'metadata_proxy_shared_secret': u.not_null
}
else:
# Juno or earlier
expected['DEFAULT'].update({