From 640dd55e0630c83d0556e270b76170de82f0df05 Mon Sep 17 00:00:00 2001
From: Jorge Niedbalski <jorge.niedbalski@linaro.org>
Date: Sun, 6 May 2018 11:37:02 -0300
Subject: [PATCH] Fix usage of openstack_ceph_rgw_auth
Patch [0] left 2 variables for authentication one is
openstack_swift_auth and the other (inexistent) openstack_ceph_rgw_auth
for the ceph_rgw start_keystone task.
This patch leaves only openstack_ceph_rgw_auth.
Closes-Bug: #1769463
[0] https://github.com/openstack/kolla-ansible/commit/84ade4e1499d0762c8ffa8adb3a2b9003476e99c
Change-Id: I1cc522d91f8258f4ca23afc10a0a2a2b35c1ff68
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
---
ansible/roles/ceph/defaults/main.yml | 1 +
ansible/roles/ceph/tasks/start_rgw_keystone.yml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/ceph/defaults/main.yml b/ansible/roles/ceph/defaults/main.yml
index 25713a95ee..851cfdbd5f 100644
--- a/ansible/roles/ceph/defaults/main.yml
+++ b/ansible/roles/ceph/defaults/main.yml
@@ -56,6 +56,7 @@ swift_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn }}:{{ rgw
ceph_rgw_keystone_user: "ceph_rgw"
openstack_swift_auth: "{{ openstack_auth }}"
+openstack_ceph_rgw_auth: "{{ openstack_auth }}"
##########
# Ceph MDS
diff --git a/ansible/roles/ceph/tasks/start_rgw_keystone.yml b/ansible/roles/ceph/tasks/start_rgw_keystone.yml
index 741a137983..7036ff6f92 100644
--- a/ansible/roles/ceph/tasks/start_rgw_keystone.yml
+++ b/ansible/roles/ceph/tasks/start_rgw_keystone.yml
@@ -10,7 +10,7 @@
url: "{{ item.url }}"
interface: "{{ item.interface }}"
region_name: "{{ openstack_region_name }}"
- auth: "{{ openstack_swift_auth }}"
+ auth: "{{ openstack_ceph_rgw_auth }}"
endpoint_type: "{{ openstack_interface }}"
run_once: True
with_items: