openstack/charm-neutron-gateway
Code Issues Proposed changes

Add region support via relation to cloud-controller

Browse Source
This commit is contained in:
James Page 2013-01-22 12:36:19 -06:00
parent 2541fac51d
commit 44a31d9023
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/hooks.py
View File

@ -135,7 +135,9 @@ def get_keystone_conf():
"quantum_host": utils.relation_get('quantum_host', "quantum_host": utils.relation_get('quantum_host',
unit, relid), unit, relid),
"quantum_port": utils.relation_get('quantum_port', "quantum_port": utils.relation_get('quantum_port',
unit, relid) unit, relid),
"region": utils.relation_get('region',
unit, relid)
} }
if None not in conf.itervalues(): if None not in conf.itervalues():
return conf return conf

2
templates/l3_agent.ini
View File

@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver interface_driver = quantum.agent.linux.interface.OVSInterfaceDriver
auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0 auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0
auth_region = RegionOne auth_region = {{ region }}
admin_tenant_name = {{ service_tenant }} admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_username }} admin_user = {{ service_username }}
admin_password = {{ service_password }} admin_password = {{ service_password }}

4
templates/metadata_agent.ini
View File

@ -1,7 +1,7 @@
[DEFAULT] [DEFAULT]
debug = True debug = True
auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0 auth_url = http://{{ keystone_host }}:{{ service_port }}/v2.0
auth_region = RegionOne auth_region = {{ region }}
admin_tenant_name = {{ service_tenant }} admin_tenant_name = {{ service_tenant }}
admin_user = {{ service_username }} admin_user = {{ service_username }}
admin_password = {{ service_password }} 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, # 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 # 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 # Server. NOTE: Nova uses a different key: quantum_metadata_proxy_shared_secret
metadata_proxy_shared_secret = {{ shared_secret }} metadata_proxy_shared_secret = {{ shared_secret }}