aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2015-11-17 17:09:08 +0000
committerPaul Bourke <paul.bourke@oracle.com>2015-11-17 17:09:08 +0000
commit89a421fba1fa62bdeeb910a77d24c1a4aa27cc5c (patch)
treea62135c6ffeaa62e06ae3f1683fc727841f773b1 /ansible
parent2f1c00a467e381b690b8fd38a5c3b003f2da7ecf (diff)
downloadkolla-89a421fba1fa62bdeeb910a77d24c1a4aa27cc5c.tar.gz
kolla-89a421fba1fa62bdeeb910a77d24c1a4aa27cc5c.zip
Fix keystone settings for Magnum
It currently has auth_url typoed which results in auth_url being specified twice Change-Id: Ia5b6385f8d28a23fc05908ceec75a7e8528894d9 Closes-Bug: #1517141
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/magnum/templates/magnum.conf.j24
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