diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-05-19 15:00:52 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-05-20 14:09:40 +0000 |
| commit | 8e6921b91ab6ac81325e898308d24c504ee54ea2 (patch) | |
| tree | 0bd9c9e4a0ff0c30f21d7a9c4ff3cec7224e4f00 /openstack/usr/share/openstack/neutron/metadata_agent.ini | |
| parent | 2a12037c85bb2be69001d775ae779c6a415ae373 (diff) | |
| download | definitions-baserock/tiagogomes/os-kilo.tar.gz | |
Neutron: add back the custom configurationbaserock/tiagogomes/os-kilo
Add back the custom configuration for Neutron, this time adapted for the
OpenStack Kilo release.
Diffstat (limited to 'openstack/usr/share/openstack/neutron/metadata_agent.ini')
| -rw-r--r-- | openstack/usr/share/openstack/neutron/metadata_agent.ini | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/openstack/usr/share/openstack/neutron/metadata_agent.ini b/openstack/usr/share/openstack/neutron/metadata_agent.ini index 4a0331ee..ee89c943 100644 --- a/openstack/usr/share/openstack/neutron/metadata_agent.ini +++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini @@ -3,21 +3,21 @@ # debug = True # The Neutron user information for accessing the Neutron API. -auth_url = http://localhost:5000/v2.0 -auth_region = RegionOne +auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +auth_region = regionOne # Turn off verification of the certificate for ssl # auth_insecure = False # Certificate Authority public key (CA cert) file for ssl # auth_ca_cert = -admin_tenant_name = %SERVICE_TENANT_NAME% -admin_user = %SERVICE_USER% -admin_password = %SERVICE_PASSWORD% +admin_tenant_name = service +admin_user = {{ NEUTRON_SERVICE_USER }} +admin_password = {{ NEUTRON_SERVICE_PASSWORD }} # Network service endpoint type to pull from the keystone catalog # endpoint_type = adminURL # IP address used by Nova metadata server -# nova_metadata_ip = 127.0.0.1 +nova_metadata_ip = {{ CONTROLLER_HOST_ADDRESS }} # TCP Port used by Nova metadata server # nova_metadata_port = 8775 @@ -40,7 +40,7 @@ admin_password = %SERVICE_PASSWORD% # 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 the same config key, but in [neutron] section. -# metadata_proxy_shared_secret = +metadata_proxy_shared_secret = {{ METADATA_PROXY_SHARED_SECRET }} # Location of Metadata Proxy UNIX domain socket # metadata_proxy_socket = $state_path/metadata_proxy |