openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix launch instance failed in trove"

Browse Source
This commit is contained in:
Zuul 2017-12-04 13:40:44 +00:00 committed by Gerrit Code Review
commit 5f58b609b2
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 = {{ rpc_transport_url }} transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 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 nova_compute_endpoint_type = internalURL
{% endif %} neutron_endpoint_type = internalURL
{% if enable_cinder | bool %} neutron_endpoint_type = internalURL
cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1 swift_endpoint_type = internalURL
{% endif %} glance_endpoint_type = internalURL
{% if enable_swift | bool %} trove_endpoint_type = internalURL
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% endif %} network_driver = trove.network.neutron.NeutronDriver
[database] [database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} 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 = {{ rpc_transport_url }} transport_url = {{ rpc_transport_url }}
trove_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3 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 nova_compute_endpoint_type = internalURL
{% endif %} neutron_endpoint_type = internalURL
{% if enable_cinder | bool %} neutron_endpoint_type = internalURL
cinder_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ cinder_api_port }}/v1 swift_endpoint_type = internalURL
{% endif %} glance_endpoint_type = internalURL
{% if enable_swift | bool %} trove_endpoint_type = internalURL
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ swift_proxy_server_port }}/v1/AUTH_
{% elif enable_ceph_rgw_keystone | bool %} network_driver = trove.network.neutron.NeutronDriver
swift_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ rgw_port }}/v1/AUTH_
{% endif %} network_label_regex = .*
[database] [database]
connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }} connection = mysql+pymysql://{{ trove_database_user }}:{{ trove_database_password }}@{{ trove_database_address }}/{{ trove_database_name }}