From 89a421fba1fa62bdeeb910a77d24c1a4aa27cc5c Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Tue, 17 Nov 2015 17:09:08 +0000
Subject: [PATCH] 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
---
ansible/roles/magnum/templates/magnum.conf.j2 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2
index b0cc895eb6..4bfa620253 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