diff --git a/hooks/hooks.py b/hooks/hooks.py index 335c02ab..90e967a0 100755 --- a/hooks/hooks.py +++ b/hooks/hooks.py @@ -135,7 +135,9 @@ def get_keystone_conf(): "quantum_host": utils.relation_get('quantum_host', unit, relid), "quantum_port": utils.relation_get('quantum_port', - unit, relid) + unit, relid), + "region": utils.relation_get('region', + unit, relid) } if None not in conf.itervalues(): return conf diff --git a/templates/l3_agent.ini b/templates/l3_agent.ini index ed3b8e13..5a3dfa87 100644 --- a/templates/l3_agent.ini +++ b/templates/l3_agent.ini @@ -1,7 +1,7 @@ [DEFAULT] interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0 -auth_region = RegionOne +auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} admin_password = {{ service_password }} diff --git a/templates/metadata_agent.ini b/templates/metadata_agent.ini index f032f532..4e1d4bfb 100644 --- a/templates/metadata_agent.ini +++ b/templates/metadata_agent.ini @@ -1,7 +1,7 @@ [DEFAULT] debug = True auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0 -auth_region = RegionOne +auth_region = {{ region }} admin_tenant_name = {{ service_tenant }} admin_user = {{ service_username }} admin_password = {{ service_password }} @@ -14,4 +14,4 @@ nova_metadata_port = 8775 # shared secret to prevent spoofing. You may select any string for a secret, # but it must match here and in the configuration used by the Nova Metadata # Server. NOTE: Nova uses a different key: quantum_metadata_proxy_shared_secret -metadata_proxy_shared_secret = {{ shared_secret }} \ No newline at end of file +metadata_proxy_shared_secret = {{ shared_secret }}