From cf1fac16986c5cc249d6207f0e3ee48fdf22e5ae Mon Sep 17 00:00:00 2001
From: Seena Fallah <seenafallah@gmail.com>
Date: Fri, 17 Jan 2025 11:00:31 +0100
Subject: [PATCH] stable-9.0: switch to ceph/ceph
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
---
docs/source/installation/containerized.rst | 4 +--
group_vars/all.yml.sample | 4 +--
library/cephadm_adopt.py | 4 +--
library/cephadm_bootstrap.py | 4 +--
roles/ceph-defaults/defaults/main.yml | 4 +--
.../add-mdss/container/group_vars/all | 4 +--
.../add-mgrs/container/group_vars/all | 4 +--
.../add-mons/container/group_vars/all | 4 +--
.../add-osds/container/group_vars/all | 4 +--
.../add-rbdmirrors/container/group_vars/all | 4 +--
.../add-rgws/container/group_vars/all | 4 +--
.../all-in-one/container/group_vars/all | 4 +--
.../all_daemons/container/group_vars/all | 4 +--
.../all_daemons_ipv6/container/group_vars/all | 4 +--
tests/functional/cephadm/group_vars/all | 4 +--
.../collocation/container/group_vars/all | 4 +--
tests/functional/docker2podman/group_vars/all | 4 +--
.../container/inventory/group_vars/all | 4 +--
.../container/group_vars/all | 4 +--
.../lvm-batch/container/group_vars/all | 4 +--
.../lvm-osds/container/group_vars/all | 4 +--
tests/functional/podman/group_vars/all | 4 +--
.../rbdmirror/container/group_vars/all | 4 +--
.../container/secondary/group_vars/all | 4 +--
.../shrink_mds/container/group_vars/all | 4 +--
.../shrink_mgr/container/group_vars/all | 4 +--
.../shrink_mon/container/group_vars/all | 4 +--
.../shrink_osd/container/group_vars/all | 4 +--
.../shrink_rbdmirror/container/group_vars/all | 4 +--
.../shrink_rgw/container/group_vars/all | 4 +--
.../subset_update/container/group_vars/all | 4 +--
tests/library/test_cephadm_bootstrap.py | 2 +-
tox-rbdmirror.ini | 1 -
tox-shrink_osd.ini | 4 ---
tox-subset_update.ini | 1 -
tox-update.ini | 1 -
tox.ini | 26 +++++++------------
37 files changed, 73 insertions(+), 86 deletions(-)
diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst
index ce94eaf558..e71bd983bd 100644
--- a/docs/source/installation/containerized.rst
+++ b/docs/source/installation/containerized.rst
@@ -30,8 +30,8 @@ You can configure your own container register, image and tag by using the ``ceph
.. code-block:: yaml
ceph_docker_registry: quay.io
- ceph_docker_image: ceph/daemon
- ceph_docker_image_tag: latest-squid
+ ceph_docker_image: ceph/ceph
+ ceph_docker_image_tag: v19
.. note::
diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 77677d60fb..554cb71078 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -510,8 +510,8 @@ dummy:
##########
# DOCKER #
##########
-#ceph_docker_image: "ceph/daemon-base"
-#ceph_docker_image_tag: latest-squid
+#ceph_docker_image: "ceph/ceph"
+#ceph_docker_image_tag: v19
#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 e20426d8a9..0f4977a814 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-squid-devel
+ image: quay.io/ceph/ceph:v19
pull: false
firewalld: false
@@ -93,7 +93,7 @@
name: mon.foo
style: legacy
environment:
- CEPHADM_IMAGE: quay.io/ceph/daemon-base:latest-squid-devel
+ CEPHADM_IMAGE: quay.io/ceph/ceph:v19
'''
RETURN = '''# '''
diff --git a/library/cephadm_bootstrap.py b/library/cephadm_bootstrap.py
index 3be13cd8c9..05e779c71c 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-squid-devel
+ image: quay.io/ceph/ceph:v19
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-squid-devel
+ CEPHADM_IMAGE: quay.io/ceph/ceph:v19
'''
RETURN = '''# '''
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 2b81acbae0..d418e38f15 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -502,8 +502,8 @@ ceph_tcmalloc_max_total_thread_cache: 134217728
##########
# DOCKER #
##########
-ceph_docker_image: "ceph/daemon-base"
-ceph_docker_image_tag: latest-squid
+ceph_docker_image: "ceph/ceph"
+ceph_docker_image_tag: v19
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 8f9e49ab53..c8dc44c64d 100644
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 4de2fcd2de..8530e28a0d 100644
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 607c5c94e6..0c0a629c74 100644
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 7a025003c6..30d963161d 100644
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 9ecaafaaa7..3326207906 100644
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 572048f28b..3f3e47626c 100644
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -29,5 +29,5 @@ rgw_override_bucket_index_max_shards: 16
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-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 33de264a6f..851a2a1e9e 100644
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -42,5 +42,5 @@ lvm_volumes:
db: journal1
db_vg: journals
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 5634ef7c4c..84b83fe2d8 100644
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -24,8 +24,8 @@ mds_max_mds: 2
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 75103929cd..e660b3a724 100644
--- a/tests/functional/all_daemons_ipv6/container/group_vars/all
+++ b/tests/functional/all_daemons_ipv6/container/group_vars/all
@@ -25,8 +25,8 @@ mds_max_mds: 2
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 4532b8e313..5c957f58aa 100644
--- a/tests/functional/cephadm/group_vars/all
+++ b/tests/functional/cephadm/group_vars/all
@@ -3,6 +3,6 @@ public_network: "192.168.30.0/24"
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-squid-devel
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
containerized_deployment: true
diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index 7d66ceefe8..d2ad0466e3 100644
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -25,8 +25,8 @@ dashboard_admin_password: $sX!cD$rYU6qR^B!
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 8aa0e3e7ba..1d2d2c719a 100644
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -21,8 +21,8 @@ handler_health_osd_check_delay: 10
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 d5c24baf61..77dd9fc9dc 100644
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -36,5 +36,5 @@ lvm_volumes:
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-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 e89ad22123..102399f1a0 100644
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -27,5 +27,5 @@ dashboard_enabled: False
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 032a74ad31..27b18ea322 100644
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -27,5 +27,5 @@ dashboard_enabled: False
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-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 29968124fc..4089f380b3 100644
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -22,5 +22,5 @@ dashboard_enabled: False
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 4b75971a05..04311e5f5e 100644
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -20,8 +20,8 @@ handler_health_osd_check_delay: 10
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 0e8a965397..d429481883 100644
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
mon_max_pg_per_osd: 512
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index b046c17145..3d1d4be207 100644
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -27,5 +27,5 @@ ceph_conf_overrides:
mon_max_pg_per_osd: 512
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 10f5f64cbf..0cd22f6442 100644
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -15,5 +15,5 @@ ceph_conf_overrides:
dashboard_enabled: False
copy_admin_key: True
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 24c450369b..3bff880205 100644
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -14,5 +14,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 c7bbb29d78..57d269011b 100644
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -14,5 +14,5 @@ ceph_conf_overrides:
osd_pool_default_size: 1
dashboard_enabled: False
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 93185a50db..593997bd2c 100644
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -15,5 +15,5 @@ ceph_conf_overrides:
dashboard_enabled: False
copy_admin_key: True
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 1b6da1fe12..0998402e40 100644
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -14,5 +14,5 @@ ceph_conf_overrides:
dashboard_enabled: False
copy_admin_key: True
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 996b992586..ed7717d7cb 100644
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -16,5 +16,5 @@ ceph_conf_overrides:
dashboard_enabled: False
copy_admin_key: True
ceph_docker_registry: quay.io
-ceph_docker_image: ceph/daemon-base
-ceph_docker_image_tag: latest-squid
\ No newline at end of file
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
\ 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 e6413e0eee..8e10ffdefb 100644
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -26,8 +26,8 @@ dashboard_enabled: false
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-squid
+ceph_docker_image: ceph/ceph
+ceph_docker_image_tag: v19
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 5bac2ffe81..80a0e12844 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-squid-devel'
+fake_image = 'quay.io/ceph/ceph:v19'
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 4541cfdbd8..4790022890 100644
--- a/tox-rbdmirror.ini
+++ b/tox-rbdmirror.ini
@@ -32,7 +32,6 @@ 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-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 f29b0bd146..5ab070d928 100644
--- a/tox-shrink_osd.ini
+++ b/tox-shrink_osd.ini
@@ -70,10 +70,6 @@ setenv=
container: PURGE_PLAYBOOK = purge-container-cluster.yml
non_container: PLAYBOOK = site.yml.sample
- CEPH_DOCKER_IMAGE_TAG = latest-squid
- CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
- UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid
-
deps= -r{toxinidir}/tests/requirements.txt
changedir=
shrink_osd_single: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:}
diff --git a/tox-subset_update.ini b/tox-subset_update.ini
index 16911788a7..d2d274bb2a 100644
--- a/tox-subset_update.ini
+++ b/tox-subset_update.ini
@@ -29,7 +29,6 @@ setenv=
container: PLAYBOOK = site-container.yml.sample
non_container: PLAYBOOK = site.yml.sample
- 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 48dad3bc92..9a7590d38f 100644
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -29,7 +29,6 @@ setenv=
container: PLAYBOOK = site-container.yml.sample
non_container: PLAYBOOK = site.yml.sample
- 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 712c1eb6d9..d0f6fe6249 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,16 +45,16 @@ commands=
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-squid} \
+ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/ceph} \
+ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:v19} \
"
ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\
ireallymeanit=yes \
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-squid} \
+ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/ceph} \
+ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:v19} \
"
# re-setup lvm, we exclude osd2 given this node uses lvm batch scenario (see corresponding inventory host file)
@@ -78,8 +78,8 @@ commands=
ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/purge-dashboard.yml --extra-vars "\
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-squid} \
+ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/ceph} \
+ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:v19} \
"
# set up the cluster again
@@ -161,9 +161,9 @@ 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-squid-devel \
+ ceph_docker_image_tag=v19 \
ceph_docker_registry=quay.io \
- ceph_docker_image=ceph/daemon-base \
+ ceph_docker_image=ceph/ceph \
ceph_docker_registry_auth=True \
ceph_docker_registry_username={env:DOCKER_HUB_USERNAME} \
ceph_docker_registry_password={env:DOCKER_HUB_PASSWORD} \
@@ -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-squid} \
+ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:v19} \
"
[cephadm-adopt]
@@ -299,12 +299,6 @@ setenv=
shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0
shrink_rgw: RGW_TO_KILL = rgw0.rgw0
- CEPH_DOCKER_IMAGE_TAG = latest-squid
- CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-main
- UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-squid
-
- switch_to_containers: CEPH_DOCKER_IMAGE_TAG = latest-squid-devel
-
deps= -r{toxinidir}/tests/requirements.txt
changedir=
all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
@@ -367,7 +361,7 @@ commands=
all_daemons,all_daemons_ipv6,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_daemon_ipv6,all_in_one,collocation: ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "no_log_on_ceph_key_tasks=false 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={env:CEPH_DEV_SHA1:latest} yes_i_know=true" --extra-vars @ceph-override.json
+ all_daemons,all_daemon_ipv6,all_in_one,collocation: ansible-playbook -vv --diff -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "no_log_on_ceph_key_tasks=false delegate_facts_host={env:DELEGATE_FACTS_HOST:True} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-main} ceph_docker_image={env:CEPH_DOCKER_IMAGE_BIS:ceph/daemon-base} ceph_dev_branch={env:CEPH_DEV_BRANCH:main} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} yes_i_know=true" --extra-vars @ceph-override.json
purge: {[purge]commands}
purge_dashboard: {[purge-dashboard]commands}