Skip to content

Commit

Permalink
Move to use single repository for ceph-ansible
Browse files Browse the repository at this point in the history
Instead of cloning all the individual roles we should clone only the
overarching ceph-ansible repository and adjust our ansible.cfg to
include the roles inside ceph-ansible.

Additionally, pin the plugins repository to stable/pike to reduce the
impact of changes upstream.
  • Loading branch information
andymcc committed Oct 11, 2017
1 parent 15fa20c commit 52714f8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
23 changes: 3 additions & 20 deletions ansible-role-requirements-xenial.yml
@@ -1,25 +1,8 @@
- name: ceph.ceph-rgw
- name: ceph-ansible
src: https://github.com/ceph/ceph-ansible
scm: git
src: https://github.com/ceph/ansible-ceph-rgw
version: v2.2.11
- name: ceph.ceph-common
scm: git
src: https://github.com/ceph/ansible-ceph-common
version: v2.2.11
- name: ceph.ceph-mon
scm: git
src: https://github.com/ceph/ansible-ceph-mon
version: v2.2.11
- name: ceph.ceph-osd
scm: git
src: https://github.com/ceph/ansible-ceph-osd
version: v2.2.11
# Dependency for ceph roles
- name: ceph.ceph-docker-common
src: https://github.com/ceph/ansible-ceph-docker-common
scm: git
version: master
- name: ../plugins
src: https://git.openstack.org/openstack/openstack-ansible-plugins
scm: git
version: master
version: stable/pike
1 change: 1 addition & 0 deletions ansible.cfg
Expand Up @@ -13,3 +13,4 @@ filter_plugins = /etc/ansible/plugins/filter
test_plugins = /etc/ansible/plugins/test
terminal_plugins = /etc/ansible/plugins/terminal
strategy_plugins = /etc/ansible/plugins/strategy
roles_path = /etc/ansible/roles:/etc/ansible/roles/ceph-ansible/roles/
6 changes: 3 additions & 3 deletions playbooks/deploy-ceph.yml
Expand Up @@ -37,22 +37,22 @@
gather_facts: false
become: True
roles:
- ceph.ceph-mon
- ceph-mon
vars_files:
- ../tests/test-vars.yml

- hosts: osds
gather_facts: false
become: True
roles:
- ceph.ceph-osd
- ceph-osd
vars_files:
- ../tests/test-vars.yml

- hosts: rgws
gather_facts: false
become: True
roles:
- ceph.ceph-rgw
- ceph-rgw
vars_files:
- ../tests/test-vars.yml

0 comments on commit 52714f8

Please sign in to comment.