stable-9.0: switch from main to squid

Signed-off-by: Seena Fallah <seenafallah@gmail.com>

diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst
index 3333bbdd57b0d8419d1b913da85a01c9d82dbc82..ce94eaf55893a6968ded0d938b0fa13a3dde92bc 100644 (file)
--- 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 ca6e48004219c7e6205f482944c7d30d82a7441b..77677d60fb1387f07d747840ea64efea832244ec 100644 (file)
--- 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 723e0a46ce03b4b9b170b250bb70038ba67f53cb..e20426d8a9dcb4f525d064e337f7667cf9231d39 100644 (file)
--- a/library/cephadm_adopt.py
+++ b/library/cephadm_adopt.py
@@ -84,7 +84,7 @@ EXAMPLES = '''
   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 @@ EXAMPLES = '''
     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 f7d2cbdca5e87513a29f31835b4359884d9a78d4..3be13cd8c9ac3914613163728996f5e80bb30f11 100644 (file)
--- a/library/cephadm_bootstrap.py
+++ b/library/cephadm_bootstrap.py
@@ -124,7 +124,7 @@ EXAMPLES = '''
   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 @@ EXAMPLES = '''
   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 a61280100c3c3e8a88fcb4d82a0c723948326c87..2b81acbae069dd87cab38fd219e09ca44905cd77 100644 (file)
--- 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 5816822db78fd6abffbcfb51d642cc0b0eef2ba6..8f9e49ab53ec8eddc148b9425fa3edb5b7979f13 100644 (file)
--- 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 7c57901d2062c71b3e8b103155e370f8533c490b..4de2fcd2de7e3067bfed78843c1d49241e318df8 100644 (file)
--- 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 9846e09db0733872f4b51ec65ddf358cd0bb93fb..607c5c94e6298f91f2efb7bc33bcd17906cead3c 100644 (file)
--- 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 e6711bff6483754e94a04289967cdd82c023abf1..7a025003c6832c8a2ac4ccc9ea7c8ee78117481f 100644 (file)
--- 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 9ad653c92f090c5eb160ab8d9cfeffedff9815c8..9ecaafaaa73a69c405bf4b5d87fed7f185f29734 100644 (file)
--- 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 cc232ecb189301b5d460017f789bc041c33c3c95..572048f28b2165f5b8471b83878d0a462f07ca54 100644 (file)
--- 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 21e9bc5d50948c11b7fe7ce2dda63438713d0472..33de264a6ff81357cfb4126e949a99d61d2df50b 100644 (file)
--- 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 7645c1ce8e6855d9040074768b9a9cbadbd6834a..5634ef7c4c9a4ed94ba2180317a089850aaf46fe 100644 (file)
--- 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 f50a51cb2f256b2ed68b6181abb218cb6f5d88cc..75103929cd34a38c40b9815e83f7d8792b3e19f5 100644 (file)
--- 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 0acf604ad78e1d9b75b6b0ce4421ac26ff8fe584..4532b8e3137c6fe30438a8addcd94a0e23ada871 100644 (file)
--- 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 b60168ab731dacac2fd7d5c8aed016da5c16e4e8..7d66ceefe864dacdc4b12ca8b414abf9faa806e8 100644 (file)
--- 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 b58d30a5d5e73c8bb5819691557f0ad295be5f1c..8aa0e3e7bade44385a4d67e3e3566856b541e9a5 100644 (file)
--- 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 20cd47ae859ca980d9b1e5dd7704708179d5611b..d5c24baf61cf117ef3cfd988e12c14c7216219b0 100644 (file)
--- 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 eaa4a7844afd8074b5ebb557a03f589ab402e49e..e89ad22123224001a9ba3d8513585ccb3fedaea9 100644 (file)
--- 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 3e5f217767e12d26ee2c0ccebca3902a77db219d..032a74ad31511febc8d01b8a6a49f18929716360 100644 (file)
--- 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 c9786a4dd8080f327d33e073827e1f059383588c..29968124fc3e11f7463d12cf4999ac4b5092f84d 100644 (file)
--- 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 5ffd6f0f05c36e4473653db2b1b07f5406b92a82..4b75971a05f42183bbc7885cf2bb27213190aea9 100644 (file)
--- 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 8db0513d95d00950a71392d114790cd8286915f1..0e8a96539780297b21b52aba040e06f04f9796ab 100644 (file)
--- 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 1c5896dcabe9370c5e07cbe246b580683359b132..b046c171459a0d5f03b2a8e810927fb6cd3483a9 100644 (file)
--- 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 4eb3151d082fcbf7de9fb09946a34e8e6cd0c34a..10f5f64cbf00cf4188066fade10493205e122a26 100644 (file)
--- 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 8ddb84b9a824caf223a9bbc5d9ac62ac54600139..24c450369be99ccbd5f3a96bdde7d4bc482dadc0 100644 (file)
--- 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 d1e5d2182f40b40cdcd194af6749118fe5d74873..c7bbb29d78e4235993fbb87b816283771782285e 100644 (file)
--- 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 5c56a1c18d54346e38c50ddab7e01a1cfcecb229..93185a50db77491f6bd775deef5c34ca6e2c2b5e 100644 (file)
--- 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 0ec43c75330e312915758c4d9a65a843c0cd681c..1b6da1fe12a78589bf09438f441cfff9d92079ce 100644 (file)
--- 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 8b918527f249f0ccb9ff12a9bb26837c0188af56..996b992586bebc015c9f096fa71c60628dc84f20 100644 (file)
--- 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 e0085ed78cd3e3f297b32a6f39c56b69f74f6e96..e6413e0eeee87fa687a87282f7c211a5ccad2bdd 100644 (file)
--- 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 9a905d780118506ede86defe502c9189f9dd57e0..5bac2ffe8132ab31fdd1ac83b18fc3c7f5fc54a8 100644 (file)
--- a/tests/library/test_cephadm_bootstrap.py
+++ b/tests/library/test_cephadm_bootstrap.py
@@ -4,7 +4,7 @@ import ca_test_common
 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 bba6460d071b0a0ac39fa21789f664997e1afc63..4541cfdbd8eb34eb333fff4fdb12cd7467152b53 100644 (file)
--- 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 fc6bb6328b4c55f5ffe0ae0f29a4cc471ddcbb14..f29b0bd146a542ffd0ea7c7e150220478a05cbfc 100644 (file)
--- 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 f4b6e0f2131c6cf949c17a511160d883c44fd564..16911788a7d406f1d1ceffd455de7ef219edfaaf 100644 (file)
--- 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 7ced3a4f2345446a49a283c4677b93aaf1255851..48dad3bc9260259737be03d6cff253aabe0fc43a 100644 (file)
--- 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 32f2f9b09fb9322aa9e19da8d9a804db03cf4b80..712c1eb6d96f423605c6535ac1b4bc2d49019350 100644 (file)
--- 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 = latest-squid
   CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
-  UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-main
+  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=