From 77fc0e105efaaa8a47e0d6f5676c01b2f674230f Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 15 Jun 2022 09:16:26 +0200 Subject: [PATCH] add better clarification on ceph-ansible current status Given that the project is still maintained for the time being, let's add a better comment about that. Signed-off-by: Guillaume Abrioux --- README.rst | 4 +++- site-container.yml.sample | 10 +++------- site.yml.sample | 10 +++------- tox-external_clients.ini | 2 ++ tox-subset_update.ini | 1 + tox-update.ini | 1 + tox.ini | 12 +++++++++++- 7 files changed, 24 insertions(+), 16 deletions(-) diff --git a/README.rst b/README.rst index 87c5bab8a..9a1428ae2 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,10 @@ -ceph-ansible -- DEPRECATED -- +ceph-ansible ============ **NOTE: cephadm is the new official installer, you should consider migrating to cephadm.** +The project is still maintained for the time being but it is encouraged to migrate to ``cephadm``. + Ansible playbooks for Ceph, the distributed filesystem. Please refer to our hosted documentation here: https://docs.ceph.com/projects/ceph-ansible/en/latest/ diff --git a/site-container.yml.sample b/site-container.yml.sample index a75235647..d552084ce 100644 --- a/site-container.yml.sample +++ b/site-container.yml.sample @@ -3,16 +3,12 @@ - hosts: localhost connection: local tasks: - - name: Warn about ceph-ansible deprecation - debug: + - name: Warn about ceph-ansible current status + fail: msg: "cephadm is the new official installer. Please, consider migrating. See https://docs.ceph.com/en/latest/cephadm/install for new deployments or https://docs.ceph.com/en/latest/cephadm/adoption for migrating existing deployments." - retries: 9 - delay: 2 - until: false - ignore_errors: true - when: not skip_deprecation_warn | default(false) | bool + when: not yes_i_know | default(false) | bool - hosts: - mons diff --git a/site.yml.sample b/site.yml.sample index 942f9ee7e..3b66683e5 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -4,16 +4,12 @@ - hosts: localhost connection: local tasks: - - name: Warn about ceph-ansible deprecation - debug: + - name: Warn about ceph-ansible current status + fail: msg: "cephadm is the new official installer. Please, consider migrating. See https://docs.ceph.com/en/latest/cephadm/install for new deployments or https://docs.ceph.com/en/latest/cephadm/adoption for migrating existing deployments." - retries: 9 - delay: 2 - until: false - ignore_errors: true - when: not skip_deprecation_warn | default(false) | bool + when: not yes_i_know | default(false) | bool - hosts: - mons diff --git a/tox-external_clients.ini b/tox-external_clients.ini index d7dbf9c1a..ba1118be9 100644 --- a/tox-external_clients.ini +++ b/tox-external_clients.ini @@ -41,6 +41,7 @@ commands= non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch=main ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb" --tags "vagrant_setup" ansible-playbook -vv -i {changedir}/inventory/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit 'all:!clients' --extra-vars "\ + yes_i_know=true \ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ ceph_dev_branch=main \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -52,6 +53,7 @@ commands= ansible-playbook -vv -i {changedir}/inventory {toxinidir}/tests/functional/external_clients_admin_key.yml ansible-playbook -vv -i {changedir}/inventory/external_clients-hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ fsid=40358a87-ab6e-4bdc-83db-1d909147861c \ external_cluster_mon_ips=192.168.31.10,192.168.31.11,192.168.31.12 \ diff --git a/tox-subset_update.ini b/tox-subset_update.ini index f33b140de..8e7e72c4d 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -43,6 +43,7 @@ commands= non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb" --tags "vagrant_setup" ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ diff --git a/tox-update.ini b/tox-update.ini index aeb1d39af..66275e36c 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -52,6 +52,7 @@ commands= non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb" --tags "vagrant_setup" ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ diff --git a/tox.ini b/tox.ini index db4b14687..520c94d22 100644 --- a/tox.ini +++ b/tox.ini @@ -61,6 +61,7 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ + yes_i_know=true \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ ceph_docker_registry_auth=True \ @@ -81,6 +82,7 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars @ceph-override.json --extra-vars "\ + yes_i_know=true \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ ceph_docker_registry_auth=True \ @@ -104,6 +106,7 @@ commands= # set up the cluster again ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ " @@ -183,6 +186,7 @@ commands= commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit mgrs {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -196,6 +200,7 @@ commands= commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit mdss {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -209,6 +214,7 @@ commands= commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit rbdmirrors {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -222,6 +228,7 @@ commands= commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit rgws {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -242,6 +249,7 @@ commands= ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=absent' ansible -i localhost, all -c local -b -m iptables -a 'chain=FORWARD protocol=tcp source=192.168.0.0/16 destination=192.168.0.0/16 jump=ACCEPT action=insert rule_num=1 state=present' ansible-playbook --ssh-common-args='-F {changedir}/secondary/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey' -vv -i {changedir}/secondary/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ ireallymeanit=yes \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -250,6 +258,7 @@ commands= ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \ " ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --limit rgws --extra-vars "\ + yes_i_know=true \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ ceph_docker_registry_auth=True \ @@ -369,6 +378,7 @@ commands= ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + yes_i_know=true \ deploy_secondary_zones=False \ ceph_dev_branch={env:CEPH_DEV_BRANCH:main} \ ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb \ @@ -387,7 +397,7 @@ commands= all_daemons,collocation: py.test --reruns 20 --reruns-delay 3 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests # handlers/idempotency test - all_daemons,all_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-main} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb" --extra-vars @ceph-override.json + all_daemons,all_in_one,collocation: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-main} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1=6f765e25ab7b138b5c901363389df705244e91bb yes_i_know=true" --extra-vars @ceph-override.json purge: {[purge]commands} purge_dashboard: {[purge-dashboard]commands}