diff options
| author | wangtianfa <wang.tianfa@99cloud.net> | 2016-02-25 20:46:06 -0500 |
|---|---|---|
| committer | wangtianfa <wang.tianfa@99cloud.net> | 2016-02-26 04:42:26 -0500 |
| commit | 11572e1c4bf8ed0d8fb93d08c25fd7a551c46df5 (patch) | |
| tree | 5343402ba26bd40d4ef3e99eaf860e7611194c9f | |
| parent | 32695378cb57cd771fb3b19bf2a774347528d14a (diff) | |
| download | kolla-11572e1c4bf8ed0d8fb93d08c25fd7a551c46df5.tar.gz kolla-11572e1c4bf8ed0d8fb93d08c25fd7a551c46df5.zip | |
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
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 4 | ||||
| -rw-r--r-- | 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 b581cec01..d733d43ef 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 6a0f8a162..264413a0f 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] |