openstack/kolla
Code Issues Proposed changes

Merge "Modify a hard-code keystone username in neutron and heat."

Browse Source
This commit is contained in:
Jenkins 2016-02-28 18:52:49 +00:00 committed by Gerrit Code Review
commit 0c7cf6fdc4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/heat/templates/heat.conf.j2
View File

@ -44,7 +44,7 @@ auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = heat username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }} password = {{ heat_keystone_password }}
[trustee] [trustee]
@ -54,7 +54,7 @@ auth_plugin = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = heat username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }} password = {{ heat_keystone_password }}
[ec2authtoken] [ec2authtoken]

4
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -40,7 +40,7 @@ project_domain_id = default
user_domain_id = default user_domain_id = default
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
project_name = service project_name = service
username = nova username = {{ nova_keystone_user }}
password = {{ nova_keystone_password }} password = {{ nova_keystone_password }}
[oslo_concurrency] [oslo_concurrency]
@ -65,7 +65,7 @@ auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = neutron username = {{ neutron_keystone_user }}
password = {{ neutron_keystone_password }} password = {{ neutron_keystone_password }}
[oslo_messaging_notifications] [oslo_messaging_notifications]