openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Remove unused [service_credentials] config sections"

This commit is contained in:
Zuul 2019-06-05 14:19:03 +00:00 committed by Gerrit Code Review
parent 557193a7ec abf10736c7
commit f9d40d2d77
3 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/roles/barbican/templates/barbican.conf.j2
View File

@ -61,16 +61,6 @@ memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[service_credentials]
auth_url = {{ keystone_internal_url }}
region_name = {{ openstack_region_name }}
password = {{ barbican_keystone_password }}
username = {{ barbican_keystone_user }}
project_name = service
project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }}
auth_type = password
[oslo_messaging_notifications]
transport_url = {{ notify_transport_url }}

10
ansible/roles/cyborg/templates/cyborg.conf.j2
View File

@ -31,15 +31,5 @@ auth_type = password
policy_file = {{ cyborg_policy_file }}
{% endif %}
[service_credentials]
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
region_name = {{ openstack_region_name }}
password = {{ cyborg_keystone_password }}
username = {{ cyborg_keystone_user }}
project_name = service
project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }}
auth_type = password
[oslo_messaging_notifications]
transport_url = {{ notify_transport_url }}

10
ansible/roles/sahara/templates/sahara.conf.j2
View File

@ -26,16 +26,6 @@ memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }}
memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
[service_credentials]
auth_url = {{ keystone_internal_url }}
region_name = {{ openstack_region_name }}
password = {{ sahara_keystone_password }}
username = {{ sahara_keystone_user }}
project_name = service
project_domain_id = {{ default_project_domain_id }}
user_domain_id = {{ default_user_domain_id }}
auth_type = password
[oslo_messaging_notifications]
transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %}