openstack/charm-neutron-gateway
Code Issues Proposed changes

Move options around a bit

Browse Source
This commit is contained in:
James Page 2015-01-21 12:15:01 +00:00
parent 00bd07b334
commit 59e77f21f8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/kilo/nova.conf
View File

@ -14,8 +14,6 @@ api_paste_config=/etc/nova/api-paste.ini
enabled_apis=metadata enabled_apis=metadata
multi_host=True multi_host=True
{% include "parts/database" %} {% include "parts/database" %}
neutron_metadata_proxy_shared_secret={{ shared_secret }}
service_neutron_metadata_proxy=True
# Access to message bus # Access to message bus
{% include "parts/rabbitmq" %} {% include "parts/rabbitmq" %}
# Access to neutron API services # Access to neutron API services
@ -27,3 +25,5 @@ admin_tenant_name={{ service_tenant }}
admin_username={{ service_username }} admin_username={{ service_username }}
admin_password={{ service_password }} admin_password={{ service_password }}
admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0 admin_auth_url={{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
service_metadata_proxy=True
metadata_proxy_shared_secret={{ shared_secret }}