diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-17 22:20:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-17 22:20:20 +0000 |
| commit | 86b778c27f6b2ff92bad47d81fb03da6944837f9 (patch) | |
| tree | 8fc367d92004e0aeafe41bbfe472c74a292ac0c5 | |
| parent | cb96171ef83b82e268c5c8e386203fe59ae9044a (diff) | |
| parent | 89a421fba1fa62bdeeb910a77d24c1a4aa27cc5c (diff) | |
| download | kolla-86b778c27f6b2ff92bad47d81fb03da6944837f9.tar.gz kolla-86b778c27f6b2ff92bad47d81fb03da6944837f9.zip | |
Merge "Fix keystone settings for Magnum"
| -rw-r--r-- | ansible/roles/magnum/templates/magnum.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index b0cc895eb..4bfa62025 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -19,7 +19,7 @@ region_name = {{ openstack_region_name }} [keystone_authtoken] auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} -auth_uri = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} +auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} auth_plugin = password project_domain_id = default user_domain_id = default @@ -29,7 +29,7 @@ password = {{ magnum_keystone_password }} [trustee] auth_uri = http://{{ kolla_internal_address }}:{{ keystone_public_port }} -auth_uri = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} +auth_url = http://{{ kolla_internal_address }}:{{ keystone_admin_port }} auth_plugin = password project_domain_id = default user_domain_id = default |