RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 00:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-volume tests.functional install new ceph-ansible dependencies

Browse Source 
Make note that ceph-ansible's requirements.txt can't be used just yet

Signed-off-by: Alfredo Deza <adeza@redhat.com>
This commit is contained in:
Alfredo Deza 2018-05-21 07:11:28 -04:00
parent 28d4d640fc
commit 22310f4316
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ceph-volume/ceph_volume/tests/functional/lvm/tox.ini
View File

@ -20,6 +20,7 @@ deps=
ansible==2.4.1
testinfra==1.7.1
pytest-xdist
notario>=0.0.13
changedir=
# plain/unencrypted
centos7-filestore-create: {toxinidir}/centos7/filestore/create
@ -39,6 +40,9 @@ changedir=
centos7-bluestore-prepare_activate: {toxinidir}/xenial/bluestore/prepare_activate
commands=
git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
# XXX Ideally we should be able to consume the requirements for ceph-ansible directly,
# but the master branch doesn't pin dependencies so we can't guarantee to work correctly
#pip install -r {envdir}/tmp/ceph-ansible/requirements.txt
vagrant up {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}

4
src/ceph-volume/ceph_volume/tests/functional/simple/tox.ini
View File

@ -21,6 +21,7 @@ deps=
ansible==2.4.1
testinfra==1.7.1
pytest-xdist
notario>=0.0.13
changedir=
centos7-filestore-activate: {toxinidir}/centos7/filestore/activate
centos7-bluestore-activate: {toxinidir}/centos7/bluestore/activate
@ -36,6 +37,9 @@ changedir=
centos7-filestore-dmcrypt_luks: {toxinidir}/centos7/filestore/dmcrypt-luks
commands=
git clone -b {env:CEPH_ANSIBLE_BRANCH:master} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
# XXX Ideally we should be able to consume the requirements for ceph-ansible directly,
# but the master branch doesn't pin dependencies so we can't guarantee to work correctly
#pip install -r {envdir}/tmp/ceph-ansible/requirements.txt
vagrant up {env:VAGRANT_UP_FLAGS:"--no-provision"} {posargs:--provider=virtualbox}
bash {toxinidir}/../scripts/generate_ssh_config.sh {changedir}