Fix ceph-ansible role-requirements
Ceph has removed the individual repos of common, osds, mons, defaults... this uses the new combined ceph-ansible role. Change-Id: Ife2580b094db9f737ff91371a4bdb89d86663ff8
This commit is contained in:
parent
f4c7cd442c
commit
03adca70dc
|
@ -178,27 +178,7 @@
|
|||
scm: git
|
||||
src: https://github.com/logan2211/ansible-resolvconf
|
||||
version: '1.4'
|
||||
- name: ceph-defaults
|
||||
- name: ceph-ansible
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-defaults
|
||||
version: v3.0.8
|
||||
- name: ceph-common
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-common
|
||||
version: v3.0.9
|
||||
- name: ceph-config
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-config
|
||||
version: v3.0.8
|
||||
- name: ceph-mon
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-mon
|
||||
version: v3.0.9
|
||||
- name: ceph-mgr
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-mgr
|
||||
version: v3.0.8
|
||||
- name: ceph-osd
|
||||
scm: git
|
||||
src: https://github.com/ceph/ansible-ceph-osd
|
||||
version: v3.0.9
|
||||
src: https://github.com/ceph/ceph-ansible
|
||||
version: b0aa2d6ee565c0cd9d7d85d015d98fff3cc2e334
|
||||
|
|
|
@ -19,7 +19,7 @@ export ANSIBLE_INVENTORY="${ANSIBLE_INVENTORY:-OSA_INVENTORY_PATH}"
|
|||
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}"
|
||||
|
|
2
tox.ini
2
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
|
||||
|
|
Loading…
Reference in New Issue