fix upgrade

Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>

diff --git a/Vagrantfile b/Vagrantfile
index dde4b30893411fb265113d6553a286a600c6a3a8..e8503f19dd1e10e3428be5efeaa6963c6344c701 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,8 +25,8 @@ GRAFANA         = settings['grafana_server_vms']
 NRBD_MIRRORS    = settings['rbd_mirror_vms']
 CLIENTS         = settings['client_vms']
 MGRS            = settings['mgr_vms']
-PUBLIC_SUBNET   = settings['public_subnet']
-CLUSTER_SUBNET  = settings['cluster_subnet']
+PUBLIC_SUBNET   = ENV['CEPH_PUBLIC_SUBNET']  || settings['public_subnet']
+CLUSTER_SUBNET  = ENV['CEPH_CLUSTER_SUBNET'] || settings['cluster_subnet']
 BOX             = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['vagrant_box']
 CLIENT_BOX      = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['client_vagrant_box'] || BOX
 BOX_URL         = ENV['CEPH_ANSIBLE_VAGRANT_BOX_URL'] || settings['vagrant_box_url']

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 94c838984361beebeb44fc544ae791ea40da6c8f..4fd199fa0b50a96666cf936541f20cae12d6a176 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -519,7 +519,7 @@ dummy:
 # DOCKER #
 ##########
 #ceph_docker_image: "ceph/daemon-base"
-#ceph_docker_image_tag: latest-main
+#ceph_docker_image_tag: latest-reef
 #ceph_docker_registry: quay.io
 #ceph_docker_registry_auth: false
 # ceph_docker_registry_username:

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index c57be0a566668b879734cee0da8c0356c86a913b..4c5be64fc004077ae476ad1035e5933d9624fa97 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -1173,6 +1173,7 @@
       ansible.builtin.systemd:
         name: "{{ 'ceph-exporter@' + ansible_facts['hostname'] if containerized_deployment | bool else 'ceph-exporter.service' }}"
         state: stopped
+      ignore_errors: true
 
     # it needs to be done in a separate task otherwise the stop just before doesn't work.
     - name: Mask and disable the ceph-exporter service
@@ -1180,6 +1181,7 @@
         name: "{{ 'ceph-exporter@' + ansible_facts['hostname'] if containerized_deployment | bool else 'ceph-exporter.service' }}"
         enabled: false
         masked: true
+      ignore_errors: true
 
     - name: Import ceph-defaults role
       ansible.builtin.import_role:

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index bd01a91ecc2038ccff9b70dd203b642b82b24cb5..b2c67eb309a3dd244f839c91bf343d06a49136dc 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -511,7 +511,7 @@ ceph_tcmalloc_max_total_thread_cache: 134217728
 # DOCKER #
 ##########
 ceph_docker_image: "ceph/daemon-base"
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 ceph_docker_registry: quay.io
 ceph_docker_registry_auth: false
 # ceph_docker_registry_username:

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index abacaac81de740b1784624feb84029f901ce64a5..3634d9c4d3d29164044402bf48c66c5387c9e929 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 34065af173d5e38ebe428d8432566df552153362..a1928da909788a2bceb0eee9241cb64be8d9fafa 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/add-mgrs/group_vars/all b/tests/functional/add-mgrs/group_vars/all
index fb9bde0f09e17f9a557152fe547baaaceb0efd8a..f9fe36762b9e216dd398e8ab201d788950e2372b 100644 (file)
--- a/tests/functional/add-mgrs/group_vars/all
+++ b/tests/functional/add-mgrs/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 cluster: ceph
 public_network: "192.168.73.0/24"
 cluster_network: "192.168.74.0/24"

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index 1fff68805fb0aa9ce8f00fbbcf5813e5893be652..0ad0cf8b2dde4251eaa6a9d1b5a57611e361404d 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/add-mons/group_vars/all b/tests/functional/add-mons/group_vars/all
index 7988877c047c719588771d4bb8d91c3a38db67af..5ac44e7bbb5457eddcaa371a7e0c14202c5cf08a 100644 (file)
--- a/tests/functional/add-mons/group_vars/all
+++ b/tests/functional/add-mons/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 cluster: ceph
 public_network: "192.168.53.0/24"
 cluster_network: "192.168.54.0/24"

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 39022d7a608003861b50b179e699ca784a2feb71..66204470e75e2eaa95c28c42eef4349ffc6dec76 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index c275d4f084bd166d458cfa6f068af514f7a77f59..ba66d50e68d7599e7d77697bd14aeff99517f8ab 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 1de1eea6f8933cfb213695c2cae95050efca9c01..b73463fc88573450538505ab5ec66ce45a5c4954 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -31,4 +31,4 @@ rgw_bucket_default_quota_max_objects: 1638400
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index daa915a6568740954808e186a36d93cf049b7070..1638ca1f8ffa173fbc64cda97a40c2cd090822a9 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -45,4 +45,4 @@ lvm_volumes:
     db_vg: journals
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 6dfcb137c949f8d183ad27c6ad26f24780437362..ec16b0504f48464075ca14234fa0d446b1b43382 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -38,7 +38,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/all_daemons_ipv6/container/group_vars/all b/tests/functional/all_daemons_ipv6/container/group_vars/all
index d0c9ee6bcf18e95aa7a00fd824f9aad6f1338b8a..c9347c8b0d257266c7766f8e9b574f7ac9fdf745 100644 (file)
--- a/tests/functional/all_daemons_ipv6/container/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/container/group_vars/all
@@ -39,7 +39,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/all_daemons_ipv6/group_vars/all b/tests/functional/all_daemons_ipv6/group_vars/all
index 204219f19ead689204b55638538470e23b018596..aa5b93f6623ca4a7009da40a6459f6ecc5c2cf4c 100644 (file)
--- a/tests/functional/all_daemons_ipv6/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 ip_version: ipv6
 public_network: "fdec:f1fb:29cd:6940::/64"
 cluster_network: "fdec:f1fb:29cd:7120::/64"

diff --git a/tests/functional/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all
index 2e074a2716975c7fa3ffaa5367ec65ddc86b5ba4..5ae26fe205b924a2dc2b1a638bc362dfbf9a2bbb 100644 (file)
--- a/tests/functional/cephadm/group_vars/all
+++ b/tests/functional/cephadm/group_vars/all
@@ -5,5 +5,5 @@ cluster_network: "192.168.31.0/24"
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main-devel
+ceph_docker_image_tag: latest-reef-devel
 containerized_deployment: true

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index e6f0fab1edf259edb474d570f101a6a4ad1f148b..9f885ff9e68c1c2b7cd90d8aaabc71ea70347567 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -27,7 +27,7 @@ dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 42e97ffd8e5146d2b3af00ae569d341b67c47720..1d70ba673d3a4139d94a09c103ff7d6a98bf56df 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -35,7 +35,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index 940a55ff861d809f49ec9eac45bc88211373b5da..5062e82da42b2fdf48dcff8358d238bad9f1bb1d 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -39,4 +39,4 @@ fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
 generate_fsid: false
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index dab885f7a8d18402b9447cffb9b44d415b3722e0..e560b6eb041f0fe5ec8b1a6393be1726d094a2d2 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -6,7 +6,7 @@ docker: True
 
 containerized_deployment: True
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
@@ -29,4 +29,4 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index a3e868dd31305c5396d50607d970bb1a78e42b29..6102398cc25d81a22f0193cd4bccfd9dce671a4f 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -29,4 +29,4 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 5e812e3556270865af8ebe7a90081ef72aed4fc0..f810f6a316459c24d83c8cb3586632edddcfae89 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -38,4 +38,4 @@ openstack_pools:
   - "{{ openstack_cinder_pool }}"
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 6101343ecd17c8d77565c7bc1cc9c5fab7940135..ed28d4acd6161336f612b9e913a5e41ac497efb8 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -34,7 +34,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all
index 54924683cdfe6a0277901d946bcbda1fe431f3e4..8ce9d0c9bfce2e75ec5cc00d3cbd91afc6025c80 100644 (file)
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef

diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index ccc55d1cf827ecd72536c8bb6cdf345596ecc364..d724111dc0704c75b00d194315a81b72f934e94f 100644 (file)
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -29,4 +29,4 @@ ceph_conf_overrides:
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 43f2de24d98d1720850a479bd29e34c517575723..f56d600950e2072982dfe663ad811f7d956fa771 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -18,4 +18,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 5488b6c41aca76f29af516777e73058708148f1c..af8ede0f01630e921c412fd0c6d44c2f0f8ffcd2 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -17,4 +17,4 @@ openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all
index bc72091a19184df16dd0b1912fbc21c0776c21ca..83913110db31b70df984c44a83771e69a233e87c 100644 (file)
--- a/tests/functional/shrink_mgr/group_vars/all
+++ b/tests/functional/shrink_mgr/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 public_network: "192.168.81.0/24"
 cluster_network: "192.168.82.0/24"
 monitor_interface: eth1

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 2fd03e9b5e10f302d74470eafc103a3c34c2d29c..8943db19d9432d891f56ee626f17635a482a8e9e 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -17,4 +17,4 @@ openstack_config: False
 dashboard_enabled: False
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 9e6f481b842709dd7c48b1e3d81089f44aa98975..6bd2e2863b64b30a55776c61925a9e580ec54708 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -18,4 +18,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index 7eeffe2663bfefd0b7d540db1d9787ff6ee8976d..5950e49abb6366417f4b34d3c3fc398b4d432245 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -17,4 +17,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 052f9ffc9fda2b4052b539784fd3e7127a6179f9..8d23ef36f4f1d3c3e3390da4670a7300ad6fef64 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -19,4 +19,4 @@ dashboard_enabled: False
 copy_admin_key: True
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
\ No newline at end of file
+ceph_docker_image_tag: latest-reef
\ No newline at end of file

diff --git a/tests/functional/shrink_rgw/group_vars/all b/tests/functional/shrink_rgw/group_vars/all
index f67e9215405d507afc103cd5b254600df4aebd96..e2a45402f22ed9caf120aa2daeed3188cebf8b83 100644 (file)
--- a/tests/functional/shrink_rgw/group_vars/all
+++ b/tests/functional/shrink_rgw/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 public_network: "192.168.89.0/24"
 cluster_network: "192.168.90.0/24"
 monitor_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index 4b8941b96ff9eae8eaeaee1ff3929189b44fdfe6..410686af9de08ad53e33b78143ebc498b0da7e93 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -29,7 +29,7 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.io
 ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-main
+ceph_docker_image_tag: latest-reef
 node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
 prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
 alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"

diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all
index 03d44a831f20280b178449bf1c45ab20f9547ee0..13725dd32cbd21871be24f62f1ae3c62595ab2f0 100644 (file)
--- a/tests/functional/subset_update/group_vars/all
+++ b/tests/functional/subset_update/group_vars/all
@@ -1,6 +1,6 @@
 ---
 ceph_origin: repository
-ceph_repository: dev
+ceph_repository: community
 public_network: "192.168.3.0/24"
 cluster_network: "192.168.4.0/24"
 radosgw_interface: "{{ 'eth1' if ansible_facts['distribution'] == 'CentOS' else 'ens6' }}"

diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index c7c53e2f12e79f9c27c65c2bdb5f4eb105840863..fe814898cb046ae2336fd98785e28b9cf79bbc07 100644 (file)
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -42,12 +42,9 @@ commands=
 
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
 
-  non_container: ansible-playbook -vv --diff -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={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
   ansible-playbook -vv --diff -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={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -57,8 +54,6 @@ commands=
 # mon1
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit mon1 --tags=mons --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -66,8 +61,6 @@ commands=
 # mon0 and mon2
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit 'mons:!mon1' --tags=mons --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -75,8 +68,6 @@ commands=
 # upgrade mgrs
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=mgrs --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -84,8 +75,6 @@ commands=
 # upgrade osd1
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit=osd1 --tags=osds --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -93,8 +82,6 @@ commands=
 # upgrade remaining osds (serially)
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --limit='osds:!osd1' --tags=osds --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -102,8 +89,6 @@ commands=
 # upgrade rgws
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=rgws --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -111,8 +96,6 @@ commands=
 # post upgrade actions
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --tags=post_upgrade --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \

diff --git a/tox-update.ini b/tox-update.ini
index 5911bf81f609a5f001f112f20a24a2f3463db97d..33b67502aeb3e55e50bf293c0f32aec46a52b3b4 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -11,7 +11,7 @@ allowlist_externals =
     pip
 passenv=*
 setenv=
-  ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey
+  ANSIBLE_SSH_ARGS = -F {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/vagrant_ssh_config -o ControlMaster=auto -o ControlPersist=600s -o PreferredAuthentications=publickey
   ANSIBLE_COLLECTIONS_PATH = {envdir}/ansible_collections
   ANSIBLE_CONFIG = {toxinidir}/ansible.cfg
   ANSIBLE_CALLBACK_ENABLED = profile_tasks
@@ -36,42 +36,41 @@ setenv=
 deps= -r{toxinidir}/tests/requirements.txt
 changedir={toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
 commands=
-  bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
-  bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
+  # use the stable-7.0 branch to deploy an octopus cluster
+  git clone -b stable-7.0 --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
 
-  ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
+  bash {envdir}/tmp/ceph-ansible/tests/scripts/vagrant_up.sh {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:} --no-provision {posargs:--provider=virtualbox}
+  bash {envdir}/tmp/ceph-ansible/tests/scripts/generate_ssh_config.sh {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}
+
+  ansible-galaxy collection install -r {envdir}/tmp/ceph-ansible/requirements.yml -v -p {envdir}/ansible_collections
 
-  ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml
+  ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml
 
-#  # use the stable-7.0 branch to deploy an octopus cluster
-#  git clone -b stable-7.0 --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible
-#  pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt
-#  bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml'
-#  # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
-#  bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm"'
+  pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt
+  bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/setup.yml'
+  # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
+  bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm" --limit 'osds:!osd2''
 
   # configure lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml --limit 'osds:!osd2'
 
-  non_container: ansible-playbook -vv --diff -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={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
-  ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
+  ansible-playbook -vv --diff -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts {envdir}/tmp/ceph-ansible/{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={env:UPDATE_CEPH_DEV_SHA1:latest} \
+      container_package_name=podman \
+      container_service_name=podman \
+      container_binary=podman \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
   "
 
-#  pip uninstall -y ansible
-#  pip install -r {toxinidir}/tests/requirements.txt
-#  ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
+  pip uninstall -y ansible
+  pip install -r {toxinidir}/tests/requirements.txt
+  ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
 
   ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:main} \
-      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \
       ceph_docker_registry_auth=True \
       ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
       ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \

diff --git a/tox.ini b/tox.ini
index 08bfeb18b7b0a92d1ab11a39d2971c11e10b8314..264223d4554a907f125d6b26e9bb85568453791c 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -328,7 +328,6 @@ changedir=
 
 commands=
   ansible-galaxy collection install -r {toxinidir}/requirements.yml -v -p {envdir}/ansible_collections
-  non_container: ansible-playbook -vv --diff -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup={env:DEV_SETUP:False} change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   bash {toxinidir}/tests/scripts/vagrant_up.sh --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}