From 0b931c9347d91de431a0bc85e7005f5f06082627 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 23 Nov 2017 14:57:41 +0800 Subject: [PATCH] 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 --- .../trove/templates/trove-taskmanager.conf.j2 | 18 +++++++-------- ansible/roles/trove/templates/trove.conf.j2 | 22 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 index 3aef3112f8..0aaae00e63 100644 --- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 +++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 @@ -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 }} diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index 768e944e21..039e351a96 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -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 }}