stable-9.0: switch to ceph/ceph

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

diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst
index ce94eaf55893a6968ded0d938b0fa13a3dde92bc..e71bd983bd327a1386fb306c928130a823d1fa4d 100644 (file)
--- 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 77677d60fb1387f07d747840ea64efea832244ec..554cb71078ac28e8bff12734b4b42c968f8e748d 100644 (file)
--- 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 e20426d8a9dcb4f525d064e337f7667cf9231d39..0f4977a81411900479c3da48cf7f8034f8c17827 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-squid-devel
+    image: quay.io/ceph/ceph:v19
     pull: false
     firewalld: false
 
@@ -93,7 +93,7 @@ EXAMPLES = '''
     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 3be13cd8c9ac3914613163728996f5e80bb30f11..05e779c71cc59047de024012f5734ffc074af9de 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-squid-devel
+    image: quay.io/ceph/ceph:v19
     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-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 2b81acbae069dd87cab38fd219e09ca44905cd77..d418e38f15e9b3fe2db73328e9faaf9beabaf0ed 100644 (file)
--- 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 8f9e49ab53ec8eddc148b9425fa3edb5b7979f13..c8dc44c64d696d64ab2fa4bccd24d39895e937b0 100644 (file)
--- 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 4de2fcd2de7e3067bfed78843c1d49241e318df8..8530e28a0d6f37e585db994cf06cc603891e4f06 100644 (file)
--- 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 607c5c94e6298f91f2efb7bc33bcd17906cead3c..0c0a629c746712e7511322be4589f604ce162cc8 100644 (file)
--- 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 7a025003c6832c8a2ac4ccc9ea7c8ee78117481f..30d963161d76e8c316b3c0c832eb8d440cd22f6f 100644 (file)
--- 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 9ecaafaaa73a69c405bf4b5d87fed7f185f29734..3326207906767feb36123aa87cc6f9c06b766d89 100644 (file)
--- 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 572048f28b2165f5b8471b83878d0a462f07ca54..3f3e47626cef46bbc0545631382f950d4829a494 100644 (file)
--- 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 33de264a6ff81357cfb4126e949a99d61d2df50b..851a2a1e9e7c01d50e55cb24cf5ee8816b080583 100644 (file)
--- 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 5634ef7c4c9a4ed94ba2180317a089850aaf46fe..84b83fe2d8c1c256c82c0b7421d3a33f1226ffc6 100644 (file)
--- 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 75103929cd34a38c40b9815e83f7d8792b3e19f5..e660b3a7243d30652e76ef9caa768e0cb0fbfbf3 100644 (file)
--- 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 4532b8e3137c6fe30438a8addcd94a0e23ada871..5c957f58aa68ec2cbaa453ac93c6697fe4db4746 100644 (file)
--- 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 7d66ceefe864dacdc4b12ca8b414abf9faa806e8..d2ad0466e3593eca4098d81d12d5ac0d109194df 100644 (file)
--- 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 8aa0e3e7bade44385a4d67e3e3566856b541e9a5..1d2d2c719ab5e5b20395f155183cf4532067b7b9 100644 (file)
--- 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 d5c24baf61cf117ef3cfd988e12c14c7216219b0..77dd9fc9dc600ecbc1fd73d6f9f3c7b5e19d27c6 100644 (file)
--- 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 e89ad22123224001a9ba3d8513585ccb3fedaea9..102399f1a079cb0aa7b8342ff09b110c6ed366c6 100644 (file)
--- 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 032a74ad31511febc8d01b8a6a49f18929716360..27b18ea322d657f9091b51ba0d7c2693de9593bd 100644 (file)
--- 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 29968124fc3e11f7463d12cf4999ac4b5092f84d..4089f380b30e0905eb1b5c76cdb75051d6bdc87b 100644 (file)
--- 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 4b75971a05f42183bbc7885cf2bb27213190aea9..04311e5f5e3bfd95e4086981d8ebea9d0bc51854 100644 (file)
--- 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 0e8a96539780297b21b52aba040e06f04f9796ab..d42948188364be2bdb106b63deb70c7f88561194 100644 (file)
--- 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 b046c171459a0d5f03b2a8e810927fb6cd3483a9..3d1d4be2072e10d5abfdaa020828115fb771d7da 100644 (file)
--- 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 10f5f64cbf00cf4188066fade10493205e122a26..0cd22f6442403f56d2b754c3d6804b45eee16f83 100644 (file)
--- 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 24c450369be99ccbd5f3a96bdde7d4bc482dadc0..3bff880205d0942bb7cc007cd69471b8bac0437a 100644 (file)
--- 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 c7bbb29d78e4235993fbb87b816283771782285e..57d269011b15c814d7e54fdbfc4b7f064458db70 100644 (file)
--- 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 93185a50db77491f6bd775deef5c34ca6e2c2b5e..593997bd2c3e565da150c79028654ab856c97d84 100644 (file)
--- 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 1b6da1fe12a78589bf09438f441cfff9d92079ce..0998402e40be005bc858172bb47760cc66f98f97 100644 (file)
--- 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 996b992586bebc015c9f096fa71c60628dc84f20..ed7717d7cb1bd69da311e2071d3432ef616b9b41 100644 (file)
--- 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 e6413e0eeee87fa687a87282f7c211a5ccad2bdd..8e10ffdefb1953d460241a5d614522b49ac6e7f4 100644 (file)
--- 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 5bac2ffe8132ab31fdd1ac83b18fc3c7f5fc54a8..80a0e128448e2315f624efc7454a73d32a80f664 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-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 4541cfdbd8eb34eb333fff4fdb12cd7467152b53..4790022890d89cd8610f0cb0693666d3f0fe0a87 100644 (file)
--- 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 f29b0bd146a542ffd0ea7c7e150220478a05cbfc..5ab070d92893a79f864a6c33a70099e250706d21 100644 (file)
--- 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 16911788a7d406f1d1ceffd455de7ef219edfaaf..d2d274bb2ac448dff94c2f8b6400cbeb9e78ca0f 100644 (file)
--- 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 48dad3bc9260259737be03d6cff253aabe0fc43a..9a7590d38f1e36c6f046582f1568fdfcd2b1ce64 100644 (file)
--- 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 712c1eb6d96f423605c6535ac1b4bc2d49019350..d0f6fe62499b114186758f54c1c9e22b1b459da0 100644 (file)
--- 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}