From abf10736c7785075803b506ca07c1f79a0a958c3 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 31 May 2019 13:25:00 +0100
Subject: [PATCH] Remove unused [service_credentials] config sections
Several services inherited [service_credentials] config sections which
they don't use in their code.
Change-Id: Iccf4358e85fb3d7ed25bc1762ff532b2c32bea4a
---
ansible/roles/barbican/templates/barbican.conf.j2 | 10 ----------
ansible/roles/cyborg/templates/cyborg.conf.j2 | 10 ----------
ansible/roles/sahara/templates/sahara.conf.j2 | 10 ----------
3 files changed, 30 deletions(-)
diff --git a/ansible/roles/barbican/templates/barbican.conf.j2 b/ansible/roles/barbican/templates/barbican.conf.j2
index 743012201e..8d13adf810 100644
--- a/ansible/roles/barbican/templates/barbican.conf.j2
+++ b/ansible/roles/barbican/templates/barbican.conf.j2
@@ -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 }}
diff --git a/ansible/roles/cyborg/templates/cyborg.conf.j2 b/ansible/roles/cyborg/templates/cyborg.conf.j2
index 06903f4526..92c0f8fa88 100644
--- a/ansible/roles/cyborg/templates/cyborg.conf.j2
+++ b/ansible/roles/cyborg/templates/cyborg.conf.j2
@@ -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 }}
diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2
index 93baf0dfc2..f2189198c7 100644
--- a/ansible/roles/sahara/templates/sahara.conf.j2
+++ b/ansible/roles/sahara/templates/sahara.conf.j2
@@ -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 %}