openstack
/
kolla-ansible
Code Issues Proposed changes

Fix launch instance failed in trove 

- remove useless *_url, which can be auto discovery
- use internalURL instead of publicURL which make it works when
  using self-signed SSL certification.
- configure network_driver to Neutron
- add network_label_regex to match all network name

Change-Id: I5654dbf391db7076c82aede5c2a4f8b7530b8381
Closes-Bug: #1734039
(cherry picked from commit 0b931c9347)
This commit is contained in:
Jeffrey Zhang 2017-11-23 14:57:41 +08:00 committed by Jeffrey Zhang
parent a6e60bea8a
commit 05cf49f55a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ansible/roles/trove/templates/trove-taskmanager.conf.j2
View File

@ -11,15 +11,15 @@ taskmanager_manager = trove.taskmanager.manager.Manager
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
{% if enable_nova | bool %}
nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2
{% endif %}
{% if enable_cinder | bool %}
cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
{% endif %}
{% if enable_swift | bool %}
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% endif %}
nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL
neutron_endpoint_type = internalURL
swift_endpoint_type = internalURL
glance_endpoint_type = internalURL
trove_endpoint_type = internalURL
network_driver = trove.network.neutron.NeutronDriver
[database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}

22
ansible/roles/trove/templates/trove.conf.j2
View File

@ -13,17 +13,17 @@ auth_strategy = keystone
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
{% if enable_nova | bool %}
nova_compute_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ nova_api_port }}/v2
{% endif %}
{% if enable_cinder | bool %}
cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1
{% endif %}
{% if enable_swift | bool %}
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% elif enable_ceph_rgw_keystone | bool %}
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ rgw_port }}/v1/AUTH_
{% endif %}
nova_compute_endpoint_type = internalURL
neutron_endpoint_type = internalURL
neutron_endpoint_type = internalURL
swift_endpoint_type = internalURL
glance_endpoint_type = internalURL
trove_endpoint_type = internalURL
network_driver = trove.network.neutron.NeutronDriver
network_label_regex = .*
[database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}