From e685ec96cd251fa6e98399debe352df22b37c840 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Tue, 24 Apr 2018 13:42:51 +0100 Subject: [PATCH] CEPHSTORA-222 Use Ansible 2.5.1.0 This PR reorganizes how we adopt plugins to facilitate ansible 2.5.1.0 Primarly, we no longer need all the plugins from OSA for Ceph to work, since the config_template plugin has moved. To address this the PR moves the osa-plugins repo dependency to the tests role requirements, and installs a separate config_template role dependency. This allows us to use ceph-ansible v3.0.x with Ansible 2.5. Additionally, as part of getting ready for the release of ceph-ansible v3.1.0 we should adopt the paths for the ceph-ansible library, callback and actions plugins. --- README.md | 2 +- ansible-role-requirements.yml | 4 ---- ansible.cfg | 6 +++--- phobos/README.md | 2 +- scripts/bootstrap-ansible.sh | 2 +- tests/ansible-role-test-requirements.yml | 4 ++++ 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 8cd0a5e..6032201 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ versions of ``ceph-ansible`` used in RPC deployments. ### **ceph-ansible version:** v3.0.29 -### **Ansible version:** 2.4.4.0 +### **Ansible version:** 2.5.1.0 ## What is rpc-ceph? diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index f18f427..946a84a 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -2,10 +2,6 @@ scm: git src: https://github.com/ceph/ceph-ansible version: v3.0.29 -- name: ../ceph_plugins - scm: git - src: https://git.openstack.org/openstack/openstack-ansible-plugins - version: 17.0.0.0b3 - name: rsyslog_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client diff --git a/ansible.cfg b/ansible.cfg index 2bd41d4..0980306 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,10 +1,10 @@ [defaults] -library = /etc/ansible/ceph_plugins/library +library = /etc/ansible/ceph_roles/ceph-ansible/library:/etc/ansible/ceph_plugins/library # set plugin path directories here, separate with colons -action_plugins = /etc/ansible/ceph_plugins/action +action_plugins = /etc/ansible/ceph_plugins/action:/etc/ansible/ceph_roles/ceph-ansible/plugins/actions cache_plugins = /etc/ansible/ceph_plugins/cache -callback_plugins = /etc/ansible/ceph_plugins/callback +callback_plugins = /etc/ansible/ceph_roles/ceph-ansible/plugins/callback:/etc/ansible/ceph_plugins/callback connection_plugins = /etc/ansible/ceph_plugins/connection lookup_plugins = /etc/ansible/ceph_plugins/lookup inventory_plugins = /etc/ansible/ceph_plugins/inventory diff --git a/phobos/README.md b/phobos/README.md index 610990f..e9fd64a 100644 --- a/phobos/README.md +++ b/phobos/README.md @@ -120,7 +120,7 @@ From the root of the rpc-ceph repo clone: * set `client_count` to the number of clients desired. ```bash -$ pip install -r requirements.txt ansible==2.4.3.0 +$ pip install -r requirements.txt ansible==2.5.1.0 $ ansible-playbook -e cluster_deploy_version=perf-v01 \ -e ssh_keyname=mykey \ -e stor_count=3 \ diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 8396a88..195e59a 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -1,6 +1,6 @@ set -e -u -x -export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.4.4.0"} +export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.5.1.0"} export SSH_DIR=${SSH_DIR:-"/root/.ssh"} export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"} # Set the role fetch mode to any option [git-clone] diff --git a/tests/ansible-role-test-requirements.yml b/tests/ansible-role-test-requirements.yml index a4e488b..4d76eff 100644 --- a/tests/ansible-role-test-requirements.yml +++ b/tests/ansible-role-test-requirements.yml @@ -2,6 +2,10 @@ src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts scm: git version: stable/pike +- name: ../ceph_plugins + scm: git + src: https://git.openstack.org/openstack/openstack-ansible-plugins + version: 587eea909c0a27a9f6015b31d14077dcc14943bb - name: lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create scm: git