aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave McCowan <dmccowan@cisco.com>2016-03-05 12:22:55 -0500
committerDave McCowan <dmccowan@cisco.com>2016-03-07 09:28:48 -0500
commit1c31951b85e915d7341655ef3377255575ba3158 (patch)
tree1e295ccb93903afd08284784238f820609f852cf
parentb0b891ed60e38b5f1ae8bd3f0b8fce51700ea1aa (diff)
downloadkolla-1c31951b85e915d7341655ef3377255575ba3158.tar.gz
kolla-1c31951b85e915d7341655ef3377255575ba3158.zip
Use internalURL for internal communication
When using separate networks for external APIs and internal APIs, services need to be configured to use the internal APIs. The default is typically publicURL. TrivialFix Change-Id: I24da63220a65e210c37d9f24b6d76a0031d66f3d
-rw-r--r--ansible/roles/glance/templates/glance-api.conf.j22
-rw-r--r--ansible/roles/heat/templates/heat.conf.j23
-rw-r--r--ansible/roles/neutron/templates/neutron.conf.j21
3 files changed, 6 insertions, 0 deletions
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2
index 2f40a44e6..2955137cb 100644
--- a/ansible/roles/glance/templates/glance-api.conf.j2
+++ b/ansible/roles/glance/templates/glance-api.conf.j2
@@ -14,6 +14,8 @@ registry_host = {{ kolla_internal_fqdn }}
show_image_direct_url= True
{% endif %}
+cinder_catalog_info = volume:cinder:internalURL
+
[database]
connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index b69738589..3f2445dc2 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -65,3 +65,6 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
[oslo_messaging_notifications]
driver = noop
+
+[clients]
+endpoint_type = internalURL
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index c1e07678e..ef426a32f 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -12,6 +12,7 @@ bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'][
bind_port = {{ neutron_server_port }}
api_paste_config = /usr/share/neutron/api-paste.ini
+endpoint_type = internalURL
# NOTE(SamYaple): We must specify this value here rather than the metadata conf
# because it is used by the l3 and dhcp agents. The reason the path has 'kolla'