From 11572e1c4bf8ed0d8fb93d08c25fd7a551c46df5 Mon Sep 17 00:00:00 2001
From: wangtianfa <wang.tianfa@99cloud.net>
Date: Thu, 25 Feb 2016 20:46:06 -0500
Subject: [PATCH] Modify a hard-code keystone username in neutron and heat.
Changed hard-code keystone username for neutron and heat in the
neutron.conf template and heat.conf template.
TrivialFix
Change-Id: Ibdd1422bd4cae5011f9fc5f4de7dfc58601dca1d
---
ansible/roles/heat/templates/heat.conf.j2 | 4 ++--
ansible/roles/neutron/templates/neutron.conf.j2 | 4 ++--
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 b581cec01d..d733d43ef4 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 6a0f8a1623..264413a0f0 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]
--
GitLab