diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-16 20:18:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-16 20:18:49 +0000 |
| commit | ff14e6ec069775405af6024bbbf05ffb5796aa14 (patch) | |
| tree | bc33009233cbd5c75a91cacea70f5178361bf8d9 | |
| parent | c3048f54bdd19c31b5cc9444878540ae59f5f25a (diff) | |
| parent | 92eb565c336151f85a5feb473f25a6662ef4e2fa (diff) | |
| download | kolla-ff14e6ec069775405af6024bbbf05ffb5796aa14.tar.gz kolla-ff14e6ec069775405af6024bbbf05ffb5796aa14.zip | |
Merge "Correct Ironic keystone_authtoken option name"
| -rw-r--r-- | ansible/roles/ironic/templates/ironic.conf.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index b22a278f2..076a73f00 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -41,9 +41,9 @@ auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_po auth_type = password project_domain_id = default user_domain_id = default -project_name = service -username = {{ ironic_keystone_user }} -password = {{ ironic_keystone_password }} +admin_tenant_name = service +admin_user = {{ ironic_keystone_user }} +admin_password = {{ ironic_keystone_password }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} |