diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-07 23:15:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-07 23:15:18 +0000 |
| commit | 4d0fb0b7f6c31c0156229dbee6762f027b60fc51 (patch) | |
| tree | c68e475fc43a202f7dcb603c00ada01d9fd99414 | |
| parent | ef81293861dd2d8e919e389a4f151eeb90779c43 (diff) | |
| parent | 1c31951b85e915d7341655ef3377255575ba3158 (diff) | |
| download | kolla-4d0fb0b7f6c31c0156229dbee6762f027b60fc51.tar.gz kolla-4d0fb0b7f6c31c0156229dbee6762f027b60fc51.zip | |
Merge "Use internalURL for internal communication"
| -rw-r--r-- | ansible/roles/glance/templates/glance-api.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 1 |
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' |