From 056fb29eb4b4bd8453bc3550ebf14767cdc73b54 Mon Sep 17 00:00:00 2001 From: Seena Fallah Date: Thu, 16 Jan 2025 18:28:19 +0100 Subject: [PATCH] stable-9.0: switch from main to squid Signed-off-by: Seena Fallah --- docs/source/installation/containerized.rst | 2 +- group_vars/all.yml.sample | 2 +- library/cephadm_adopt.py | 4 ++-- library/cephadm_bootstrap.py | 4 ++-- roles/ceph-defaults/defaults/main.yml | 2 +- .../add-mdss/container/group_vars/all | 2 +- .../add-mgrs/container/group_vars/all | 2 +- .../add-mons/container/group_vars/all | 2 +- .../add-osds/container/group_vars/all | 2 +- .../add-rbdmirrors/container/group_vars/all | 2 +- .../add-rgws/container/group_vars/all | 2 +- .../all-in-one/container/group_vars/all | 2 +- .../all_daemons/container/group_vars/all | 2 +- .../all_daemons_ipv6/container/group_vars/all | 2 +- tests/functional/cephadm/group_vars/all | 2 +- .../collocation/container/group_vars/all | 2 +- tests/functional/docker2podman/group_vars/all | 2 +- .../container/inventory/group_vars/all | 2 +- .../container/group_vars/all | 2 +- .../lvm-batch/container/group_vars/all | 2 +- .../lvm-osds/container/group_vars/all | 2 +- tests/functional/podman/group_vars/all | 2 +- .../rbdmirror/container/group_vars/all | 2 +- .../container/secondary/group_vars/all | 2 +- .../shrink_mds/container/group_vars/all | 2 +- .../shrink_mgr/container/group_vars/all | 2 +- .../shrink_mon/container/group_vars/all | 2 +- .../shrink_osd/container/group_vars/all | 2 +- .../shrink_rbdmirror/container/group_vars/all | 2 +- .../shrink_rgw/container/group_vars/all | 2 +- .../subset_update/container/group_vars/all | 2 +- tests/library/test_cephadm_bootstrap.py | 2 +- tox-rbdmirror.ini | 2 +- tox-shrink_osd.ini | 4 ++-- tox-subset_update.ini | 2 +- tox-update.ini | 2 +- tox.ini | 18 +++++++++--------- 37 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst index 3333bbdd57..ce94eaf558 100644 --- a/docs/source/installation/containerized.rst +++ b/docs/source/installation/containerized.rst @@ -31,7 +31,7 @@ You can configure your own container register, image and tag by using the ``ceph ceph_docker_registry: quay.io ceph_docker_image: ceph/daemon - ceph_docker_image_tag: latest + ceph_docker_image_tag: latest-squid .. note:: diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index ca6e480042..77677d60fb 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -511,7 +511,7 @@ dummy: # DOCKER # ########## #ceph_docker_image: "ceph/daemon-base" -#ceph_docker_image_tag: latest-main +#ceph_docker_image_tag: latest-squid #ceph_docker_registry: quay.io #ceph_docker_registry_auth: false # ceph_docker_registry_username: diff --git a/library/cephadm_adopt.py b/library/cephadm_adopt.py index 723e0a46ce..e20426d8a9 100644 --- a/library/cephadm_adopt.py +++ b/library/cephadm_adopt.py @@ -84,7 +84,7 @@ cephadm_adopt: name: mon.foo style: legacy - image: quay.io/ceph/daemon-base:latest-main-devel + image: quay.io/ceph/daemon-base:latest-squid-devel pull: false firewalld: false @@ -93,7 +93,7 @@ name: mon.foo style: legacy environment: - CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel + CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-squid-devel ''' RETURN = '''# ''' diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py index f7d2cbdca5..3be13cd8c9 100644 --- a/library/cephadm_bootstrap.py +++ b/library/cephadm_bootstrap.py @@ -124,7 +124,7 @@ cephadm_bootstrap: mon_ip: 192.168.42.1 fsid: 3c9ba63a-c7df-4476-a1e7-317dfc711f82 - image: quay.io/ceph/daemon-base:latest-main-devel + image: quay.io/ceph/daemon-base:latest-squid-devel dashboard: false monitoring: false firewalld: false @@ -133,7 +133,7 @@ cephadm_bootstrap: mon_ip: 192.168.42.1 environment: - CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-main-devel + CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-squid-devel ''' RETURN = '''# ''' diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index a61280100c..2b81acbae0 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -503,7 +503,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-squid 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 5816822db7..8f9e49ab53 100644 --- a/tests/functional/add-mdss/container/group_vars/all +++ b/tests/functional/add-mdss/container/group_vars/all @@ -28,4 +28,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-squid \ 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 7c57901d20..4de2fcd2de 100644 --- a/tests/functional/add-mgrs/container/group_vars/all +++ b/tests/functional/add-mgrs/container/group_vars/all @@ -28,4 +28,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-squid \ No newline at end of file diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all index 9846e09db0..607c5c94e6 100644 --- a/tests/functional/add-mons/container/group_vars/all +++ b/tests/functional/add-mons/container/group_vars/all @@ -28,4 +28,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-squid \ No newline at end of file diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index e6711bff64..7a025003c6 100644 --- a/tests/functional/add-osds/container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -28,4 +28,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-squid \ 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 9ad653c92f..9ecaafaaa7 100644 --- a/tests/functional/add-rbdmirrors/container/group_vars/all +++ b/tests/functional/add-rbdmirrors/container/group_vars/all @@ -28,4 +28,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-squid \ 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 cc232ecb18..572048f28b 100644 --- a/tests/functional/add-rgws/container/group_vars/all +++ b/tests/functional/add-rgws/container/group_vars/all @@ -30,4 +30,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-squid \ 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 21e9bc5d50..33de264a6f 100644 --- a/tests/functional/all-in-one/container/group_vars/all +++ b/tests/functional/all-in-one/container/group_vars/all @@ -43,4 +43,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-squid \ 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 7645c1ce8e..5634ef7c4c 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -25,7 +25,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-squid 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 f50a51cb2f..75103929cd 100644 --- a/tests/functional/all_daemons_ipv6/container/group_vars/all +++ b/tests/functional/all_daemons_ipv6/container/group_vars/all @@ -26,7 +26,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-squid 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/cephadm/group_vars/all b/tests/functional/cephadm/group_vars/all index 0acf604ad7..4532b8e313 100644 --- a/tests/functional/cephadm/group_vars/all +++ b/tests/functional/cephadm/group_vars/all @@ -4,5 +4,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-squid-devel containerized_deployment: true diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all index b60168ab73..7d66ceefe8 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -26,7 +26,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-squid 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 b58d30a5d5..8aa0e3e7ba 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -22,7 +22,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-squid 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 20cd47ae85..d5c24baf61 100644 --- a/tests/functional/external_clients/container/inventory/group_vars/all +++ b/tests/functional/external_clients/container/inventory/group_vars/all @@ -37,4 +37,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-squid \ 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 eaa4a7844a..e89ad22123 100644 --- a/tests/functional/lvm-auto-discovery/container/group_vars/all +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -28,4 +28,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 +ceph_docker_image_tag: latest-squid diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all index 3e5f217767..032a74ad31 100644 --- a/tests/functional/lvm-batch/container/group_vars/all +++ b/tests/functional/lvm-batch/container/group_vars/all @@ -28,4 +28,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-squid \ 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 c9786a4dd8..29968124fc 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -23,4 +23,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 +ceph_docker_image_tag: latest-squid diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index 5ffd6f0f05..4b75971a05 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -21,7 +21,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-squid 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 8db0513d95..0e8a965397 100644 --- a/tests/functional/rbdmirror/container/group_vars/all +++ b/tests/functional/rbdmirror/container/group_vars/all @@ -28,4 +28,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-squid diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all index 1c5896dcab..b046c17145 100644 --- a/tests/functional/rbdmirror/container/secondary/group_vars/all +++ b/tests/functional/rbdmirror/container/secondary/group_vars/all @@ -28,4 +28,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-squid diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all index 4eb3151d08..10f5f64cbf 100644 --- a/tests/functional/shrink_mds/container/group_vars/all +++ b/tests/functional/shrink_mds/container/group_vars/all @@ -16,4 +16,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-squid \ 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 8ddb84b9a8..24c450369b 100644 --- a/tests/functional/shrink_mgr/container/group_vars/all +++ b/tests/functional/shrink_mgr/container/group_vars/all @@ -15,4 +15,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-squid \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all index d1e5d2182f..c7bbb29d78 100644 --- a/tests/functional/shrink_mon/container/group_vars/all +++ b/tests/functional/shrink_mon/container/group_vars/all @@ -15,4 +15,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-squid \ 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 5c56a1c18d..93185a50db 100644 --- a/tests/functional/shrink_osd/container/group_vars/all +++ b/tests/functional/shrink_osd/container/group_vars/all @@ -16,4 +16,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-squid \ 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 0ec43c7533..1b6da1fe12 100644 --- a/tests/functional/shrink_rbdmirror/container/group_vars/all +++ b/tests/functional/shrink_rbdmirror/container/group_vars/all @@ -15,4 +15,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-squid \ 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 8b918527f2..996b992586 100644 --- a/tests/functional/shrink_rgw/container/group_vars/all +++ b/tests/functional/shrink_rgw/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-squid \ No newline at end of file diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all index e0085ed78c..e6413e0eee 100644 --- a/tests/functional/subset_update/container/group_vars/all +++ b/tests/functional/subset_update/container/group_vars/all @@ -27,7 +27,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-squid 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/library/test_cephadm_bootstrap.py b/tests/library/test_cephadm_bootstrap.py index 9a905d7801..5bac2ffe81 100644 --- a/tests/library/test_cephadm_bootstrap.py +++ b/tests/library/test_cephadm_bootstrap.py @@ -4,7 +4,7 @@ import cephadm_bootstrap fake_fsid = '0f1e0605-db0b-485c-b366-bd8abaa83f3b' -fake_image = 'quay.io/ceph/daemon-base:latest-main-devel' +fake_image = 'quay.io/ceph/daemon-base:latest-squid-devel' fake_ip = '192.168.42.1' fake_registry = 'quay.io' fake_registry_user = 'foo' diff --git a/tox-rbdmirror.ini b/tox-rbdmirror.ini index bba6460d07..4541cfdbd8 100644 --- a/tox-rbdmirror.ini +++ b/tox-rbdmirror.ini @@ -32,7 +32,7 @@ setenv= container: CEPH_RBD_MIRROR_REMOTE_MON_HOSTS = 192.168.144.10 non_container: CEPH_RBD_MIRROR_REMOTE_MON_HOSTS = 192.168.140.10 - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid UPDATE_CEPH_DEV_BRANCH = main UPDATE_CEPH_DEV_SHA1 = latest ROLLING_UPDATE = True diff --git a/tox-shrink_osd.ini b/tox-shrink_osd.ini index fc6bb6328b..f29b0bd146 100644 --- a/tox-shrink_osd.ini +++ b/tox-shrink_osd.ini @@ -70,9 +70,9 @@ setenv= container: PURGE_PLAYBOOK = purge-container-cluster.yml non_container: PLAYBOOK = site.yml.sample - CEPH_DOCKER_IMAGE_TAG = latest-main + CEPH_DOCKER_IMAGE_TAG = latest-squid CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid deps= -r{toxinidir}/tests/requirements.txt changedir= diff --git a/tox-subset_update.ini b/tox-subset_update.ini index f4b6e0f213..16911788a7 100644 --- a/tox-subset_update.ini +++ b/tox-subset_update.ini @@ -29,7 +29,7 @@ setenv= container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid UPDATE_CEPH_DEV_BRANCH = main UPDATE_CEPH_DEV_SHA1 = latest ROLLING_UPDATE = True diff --git a/tox-update.ini b/tox-update.ini index 7ced3a4f23..48dad3bc92 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -29,7 +29,7 @@ setenv= container: PLAYBOOK = site-container.yml.sample non_container: PLAYBOOK = site.yml.sample - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid UPDATE_CEPH_DEV_BRANCH = main UPDATE_CEPH_DEV_SHA1 = latest ROLLING_UPDATE = True diff --git a/tox.ini b/tox.ini index 32f2f9b09f..4864a94305 100644 --- a/tox.ini +++ b/tox.ini @@ -46,7 +46,7 @@ commands= ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rbd_map_devices.yml --extra-vars "\ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-squid} \ " ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ @@ -54,7 +54,7 @@ commands= remove_packages=yes \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-squid} \ " # re-setup lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file) @@ -79,7 +79,7 @@ commands= ireallymeanit=yes \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon-base} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-squid} \ " # set up the cluster again @@ -161,7 +161,7 @@ commands= commands= ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ ireallymeanit=yes \ - ceph_docker_image_tag=latest-main-devel \ + ceph_docker_image_tag=latest-squid-devel \ ceph_docker_registry=quay.io \ ceph_docker_image=ceph/daemon-base \ ceph_docker_registry_auth=True \ @@ -248,7 +248,7 @@ commands= [storage-inventory] commands= ansible-playbook -vv --diff -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/storage-inventory.yml --extra-vars "\ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-main} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-squid} \ " [cephadm-adopt] @@ -299,11 +299,11 @@ setenv= shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0 shrink_rgw: RGW_TO_KILL = rgw0.rgw0 - CEPH_DOCKER_IMAGE_TAG = latest-main - CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main - UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main + CEPH_DOCKER_IMAGE_TAG = latest-squid + CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-squid + UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid - switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-main-devel + switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-squid-devel deps= -r{toxinidir}/tests/requirements.txt changedir=