diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-23 13:17:57 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-25 10:23:47 +0000 |
| commit | 8ce223946c097169c79a4277e4972be6be71e621 (patch) | |
| tree | dd6b2b89debbf2141511d37b7a71c1721d162d49 | |
| parent | 2c9e41316d8705a1e7a91d29c9d102f465ea8976 (diff) | |
| download | definitions-8ce223946c097169c79a4277e4972be6be71e621.tar.gz | |
neutron: minimize varialbes in conf files
| -rw-r--r-- | openstack/usr/share/openstack/neutron/metadata_agent.ini | 4 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/neutron/neutron.conf | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/openstack/usr/share/openstack/neutron/metadata_agent.ini b/openstack/usr/share/openstack/neutron/metadata_agent.ini index 9ce3ab46..26ca9385 100644 --- a/openstack/usr/share/openstack/neutron/metadata_agent.ini +++ b/openstack/usr/share/openstack/neutron/metadata_agent.ini @@ -4,7 +4,7 @@ debug = True verbose = True # The Neutron user information for accessing the Neutron API. -auth_url = {{ KEYSTONE_INTERNAL_URL }} +auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 auth_region = regionOne # Turn off verification of the certificate for ssl # auth_insecure = False @@ -18,7 +18,7 @@ admin_password = {{ NEUTRON_SERVICE_PASSWORD }} # endpoint_type = adminURL # IP address used by Nova metadata server -nova_metadata_ip = {{ NOVA_HOST }} +nova_metadata_ip = {{ CONTROLLER_HOST_ADDRESS }} # TCP Port used by Nova metadata server # nova_metadata_port = 8775 diff --git a/openstack/usr/share/openstack/neutron/neutron.conf b/openstack/usr/share/openstack/neutron/neutron.conf index fea0d476..4608e732 100644 --- a/openstack/usr/share/openstack/neutron/neutron.conf +++ b/openstack/usr/share/openstack/neutron/neutron.conf @@ -246,7 +246,7 @@ notify_nova_on_port_data_changes = True nova_url = http://onenode:8774/v2 # Name of nova region to use. Useful if keystone manages more than one region -nova_region_name = {{ NOVA_REGION }} +nova_region_name = regionOne # Username for connection to nova in admin context nova_admin_username = {{ NOVA_SERVICE_USER }} @@ -258,7 +258,7 @@ nova_admin_tenant_id = {{ SERVICE_TENANT_ID }} nova_admin_password = {{ NOVA_SERVICE_PASSWORD }} # Authorization URL for connection to nova in admin context. -nova_admin_auth_url = {{ KEYSTONE_ADMIN_URL }} +nova_admin_auth_url = http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0 # CA file for novaclient to verify server certificates # nova_ca_certificates_file = @@ -557,8 +557,8 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf # =========== end of items for agent management extension ===== [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ NEUTRON_SERVICE_USER }} admin_password = {{ NEUTRON_SERVICE_PASSWORD }} |