aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/heat/templates/heat.conf.j24
-rw-r--r--ansible/roles/neutron/templates/neutron.conf.j24
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index 39a4ae260..b69738589 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -44,7 +44,7 @@ auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
-username = heat
+username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }}
[trustee]
@@ -54,7 +54,7 @@ auth_plugin = password
project_domain_id = default
user_domain_id = default
project_name = service
-username = heat
+username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }}
[ec2authtoken]
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2
index 802611f03..c1e07678e 100644
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -40,7 +40,7 @@ project_domain_id = default
user_domain_id = default
region_name = {{ openstack_region_name }}
project_name = service
-username = nova
+username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }}
[oslo_concurrency]
@@ -65,7 +65,7 @@ auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
-username = neutron
+username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }}
[oslo_messaging_notifications]