]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tox: add cephadm_adopt scenario
authorDimitri Savineau <dsavinea@redhat.com>
Mon, 6 Jul 2020 18:27:50 +0000 (14:27 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Fri, 10 Jul 2020 15:08:30 +0000 (11:08 -0400)
This adds an optional cephadm_adopt scenario which is based on
all_daemons.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 14eed639213056721879cd23718526b3a68bd439)

tox.ini

diff --git a/tox.ini b/tox.ini
index 6095466ecb663020382237b78ab307b31a42a7d7..f91bc6cbfcc6ca1f49cd633c8e4085bd00fe895f 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery,all_in_one}
+envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,shrink_rbdmirror,shrink_rgw,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery,all_in_one,cephadm_adopt}
   {centos,ubuntu}-container-{ooo_collocation}
   {centos,ubuntu}-non_container-{switch_to_containers}
   infra_lv_create
@@ -359,6 +359,17 @@ commands=
     ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
   "
 
+[cephadm-adopt]
+commands=
+  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/cephadm-adopt.yml --extra-vars "\
+      ireallymeanit=yes \
+      delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
+      fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-octopus} \
+  "
+
 [testenv]
 whitelist_externals =
     vagrant
@@ -429,6 +440,7 @@ changedir=
   storage_inventory: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:}
   lvm_auto_discovery: {toxinidir}/tests/functional/lvm-auto-discovery{env:CONTAINER_DIR:}
   all_in_one: {toxinidir}/tests/functional/all-in-one{env:CONTAINER_DIR:}
+  cephadm_adopt: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
 
 commands=
   rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
@@ -487,5 +499,6 @@ commands=
   add_rgws: {[add-rgws]commands}
   rgw_multisite: {[rgw-multisite]commands}
   storage_inventory: {[storage-inventory]commands}
+  cephadm_adopt: {[cephadm-adopt]commands}
 
   vagrant destroy --force