openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use internalURL for internal communication"

Browse Source
This commit is contained in:
Jenkins 2016-03-07 23:15:18 +00:00 committed by Gerrit Code Review
commit 4d0fb0b7f6
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -14,6 +14,8 @@ registry_host = {{ kolla_internal_fqdn }}
show_image_direct_url= True show_image_direct_url= True
{% endif %} {% endif %}
cinder_catalog_info = volume:cinder:internalURL
[database] [database]
connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}

3
ansible/roles/heat/templates/heat.conf.j2
View File

@ -65,3 +65,6 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = noop driver = noop
[clients]
endpoint_type = internalURL

1
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -12,6 +12,7 @@ bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'][
bind_port = {{ neutron_server_port }} bind_port = {{ neutron_server_port }}
api_paste_config = /usr/share/neutron/api-paste.ini 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 # 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' # because it is used by the l3 and dhcp agents. The reason the path has 'kolla'