From 01501f33ad965e8174bcbdd05a7341dc691d171d Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 14 Dec 2017 10:34:21 +0000
Subject: [PATCH] ceph: Switch to central ceph-ansible repository

All the ceph roles are generated from the central ceph-ansible
repository. However, it appears that the script (or CI) that
generates these roles has been broken for a while. The last update
for generated roles was nearly 2 months ago. This means that we
are missing a lot of ceph features and fixes that exist in the central
repo but not on the generated roles. Lets switch to the main
ceph-ansible repository for our Ceph deployments in order to ensure
that we are always using the latest code.

Change-Id: Ic907ee734a95e8af7c4c51568cc0870607b7b2f9
---
 ansible-role-requirements.yml | 24 ++----------------------
 scripts/openstack-ansible.rc  |  2 +-
 tox.ini                       |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 23bc0d6110..f753699115 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -182,29 +182,9 @@
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
   version: master
-- name: ceph-defaults
+- name: ceph-ansible
   scm: git
-  src: https://github.com/ceph/ansible-ceph-defaults
-  version: master
-- name: ceph-common
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-common
-  version: master
-- name: ceph-config
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-config
-  version: master
-- name: ceph-mon
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-mon
-  version: master
-- name: ceph-mgr
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-mgr
-  version: master
-- name: ceph-osd
-  scm: git
-  src: https://github.com/ceph/ansible-ceph-osd
+  src: https://github.com/ceph/ceph-ansible
   version: master
 - name: opendaylight
   scm: git
diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc
index 07e220dccc..d08b03cf8a 100644
--- a/scripts/openstack-ansible.rc
+++ b/scripts/openstack-ansible.rc
@@ -19,7 +19,7 @@ export ANSIBLE_INVENTORY="${ANSIBLE_INVENTORY:-OSA_INVENTORY_PATH/dynamic_invent
 export ANSIBLE_LOG_PATH="${ANSIBLE_LOG_PATH:-/openstack/log/ansible-logging/ansible.log}"
 mkdir -p "$(dirname ${ANSIBLE_LOG_PATH})" || unset ANSIBLE_LOG_PATH
 
-export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK_PATH/roles}"
+export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK_PATH/roles:/etc/ansible/roles/ceph-ansible/roles}"
 
 export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-/etc/ansible/roles/plugins/library}"
 export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}"
diff --git a/tox.ini b/tox.ini
index e144bcb204..7ed5fa58f8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ setenv =
     PYTHONWARNINGS=default::DeprecationWarning
     VIRTUAL_ENV={envdir}
     WORKING_DIR={toxinidir}
-    ANSIBLE_EXTRA_ROLE_DIRS={toxinidir}/playbooks/roles
+    ANSIBLE_EXTRA_ROLE_DIRS={toxinidir}/playbooks/roles:{homedir}/.ansible/roles/ceph-ansible/roles
     ANSIBLE_ROLE_REQUIREMENTS_PATH={toxinidir}/ansible-role-requirements.yml
     TEST_PLAYBOOK={toxinidir}/tests/bootstrap-aio.yml {toxinidir}/playbooks/setup-everything.yml
     ANSIBLE_LINT_PARAMS=--exclude={homedir}/.ansible/roles