tests: use quay.io instead of quay.ceph.io

This makes the CI use quay.io instead of quay.ceph.io

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit e55ca0188190173320ca77c62d2a908e9e8f5c61)

diff --git a/docs/source/installation/containerized.rst b/docs/source/installation/containerized.rst
index b1115357295fe032fb526b7f559d327a0611dcbe..3333bbdd57b0d8419d1b913da85a01c9d82dbc82 100644 (file)
--- a/docs/source/installation/containerized.rst
+++ b/docs/source/installation/containerized.rst
@@ -29,8 +29,8 @@ You can configure your own container register, image and tag by using the ``ceph
 
 .. code-block:: yaml
 
-   ceph_docker_registry: quay.ceph.io
-   ceph_docker_image: ceph-ci/daemon
+   ceph_docker_registry: quay.io
+   ceph_docker_image: ceph/daemon
    ceph_docker_image_tag: latest
 
 .. note::

diff --git a/docs/source/installation/methods.rst b/docs/source/installation/methods.rst
index 23bc91d13cf9a39ed341c5c9342a9bb6ff1e1996..d146dce4b6a16aa45e86090b4dd0b3a300f4e440 100644 (file)
--- a/docs/source/installation/methods.rst
+++ b/docs/source/installation/methods.rst
@@ -8,8 +8,3 @@ ceph-ansible can deploy Ceph either in a non-containerized context (via packages
 
    non-containerized
    containerized
-<<<<<<< HEAD
-=======
-
-The difference here is that you don't have the rbd command on the host when using the containerized deployment so everything related to ceph needs to be executed within a container. So in the case there is software like e.g. Open Nebula which requires that the rbd command is accessible directly on the host (non-containerized) then you have to install the rbd command by yourself on those servers outside of containers (or make sure that this software somehow runs within containers as well and that it can access rbd).
->>>>>>> 8b1474ab7... Docs: fix some typos

diff --git a/docs/source/testing/tox.rst b/docs/source/testing/tox.rst
index ae845d2bbd640f512cf21e12fbb4c63b5922be60..e2c3a3286d702b33e8a7beb3eeee9069c67c277c 100644 (file)
--- a/docs/source/testing/tox.rst
+++ b/docs/source/testing/tox.rst
@@ -21,9 +21,9 @@ runs of ``ceph-ansible``.
 
 The following environent variables are available for use:
 
-* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.ceph.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
+* ``CEPH_DOCKER_REGISTRY``: (default: ``quay.io``) This would configure the ``ceph-ansible`` variable ``ceph_docker_registry``.
 
-* ``CEPH_DOCKER_IMAGE``: (default: ``ceph-ci/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
+* ``CEPH_DOCKER_IMAGE``: (default: ``ceph/daemon``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image``.
 
 * ``CEPH_DOCKER_IMAGE_TAG``: (default: ``latest``) This would configure the ``ceph-ansible`` variable ``ceph_docker_image_name``.
 

diff --git a/tests/functional/add-mdss/container/group_vars/all b/tests/functional/add-mdss/container/group_vars/all
index 6f3e7924649f0f08635521befa9daff9eecf60f7..04b25af80d2f7bd3772ea4409e6901941e721c9a 100644 (file)
--- a/tests/functional/add-mdss/container/group_vars/all
+++ b/tests/functional/add-mdss/container/group_vars/all
@@ -25,6 +25,6 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/add-mgrs/container/group_vars/all b/tests/functional/add-mgrs/container/group_vars/all
index 2f10af8e1b106a72430a33e62eee1f8479093c1f..078136b80127a47c89f954089243f6a9c737f82a 100644 (file)
--- a/tests/functional/add-mgrs/container/group_vars/all
+++ b/tests/functional/add-mgrs/container/group_vars/all
@@ -26,6 +26,6 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/add-mons/container/group_vars/all b/tests/functional/add-mons/container/group_vars/all
index dcbee1eb18160ec7bbcf3991221a9f4ddc5aaf22..39bc82d7828fc3c3f7e24841ccc573a9e5c98571 100644 (file)
--- a/tests/functional/add-mons/container/group_vars/all
+++ b/tests/functional/add-mons/container/group_vars/all
@@ -26,6 +26,6 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 4c577d41707bae3ab0f2bdfaec4903258e162b82..4fd0f2a2282cfa937cf4e1dd4fade5f67a7826a8 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -25,6 +25,6 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/add-rbdmirrors/container/group_vars/all b/tests/functional/add-rbdmirrors/container/group_vars/all
index 8675fabc69351a580fa91f143846a979cf7a8f7d..30283c962ee0a5c52749e133529c93d53427b177 100644 (file)
--- a/tests/functional/add-rbdmirrors/container/group_vars/all
+++ b/tests/functional/add-rbdmirrors/container/group_vars/all
@@ -26,6 +26,6 @@ ceph_conf_overrides:
   global:
     osd_pool_default_size: 1
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/add-rgws/container/group_vars/all b/tests/functional/add-rgws/container/group_vars/all
index 1f2c0a63687234a873a45100506f8dce4df76aa7..48bcc0754578077f8a0cbb3755b6bff2ba4c5516 100644 (file)
--- a/tests/functional/add-rgws/container/group_vars/all
+++ b/tests/functional/add-rgws/container/group_vars/all
@@ -28,6 +28,6 @@ ceph_conf_overrides:
 rgw_override_bucket_index_max_shards: 16
 rgw_bucket_default_quota_max_objects: 1638400
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/all-in-one/container/group_vars/all b/tests/functional/all-in-one/container/group_vars/all
index 1e50b133dbcf13a4b3bb3dc73b38b4f63ab92378..78ebdceaf59ca6ea75ab040f7656c28830e437a3 100644 (file)
--- a/tests/functional/all-in-one/container/group_vars/all
+++ b/tests/functional/all-in-one/container/group_vars/all
@@ -41,6 +41,6 @@ lvm_volumes:
     data_vg: test_group
     db: journal1
     db_vg: journals
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 9b9310614ce60900cd9360869170d46794fb8caa..e83e18d4ae51044fe130d6a3c9cc7cb028e29214 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -42,10 +42,10 @@ handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 9a80e566f8dbc40e1254cbd1508b1c0a4fd9df29..1457b226654e7b7e67b96f90cf4f735f6a953e0d 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -35,10 +35,10 @@ handler_health_osd_check_delay: 10
 mds_max_mds: 2
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index d8cd6aa73965152a9c429e55df395a96f789ccd0..f3ff6ed7207ed62c704b6a17536b31d1575a6d6a 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -22,10 +22,10 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 9fdbd55b43ed06bf45f0b456d0188dc732aedf15..20d5e3b023bae14e772f417f0a41d792327e9957 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -19,10 +19,10 @@ handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index 23205e24cd7dd2d63bc1f7b906c9a327430c8c89..b1310bd4d56ef234579abe9c8a91051adc695ddc 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -42,10 +42,10 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/external_clients/container/inventory/group_vars/all b/tests/functional/external_clients/container/inventory/group_vars/all
index b61c80808bcd717d509e1caa2eec2e265288d4b5..cbe96ba9f7c1012bcf9e325a2563062f64a3cc12 100644 (file)
--- a/tests/functional/external_clients/container/inventory/group_vars/all
+++ b/tests/functional/external_clients/container/inventory/group_vars/all
@@ -37,6 +37,6 @@ lvm_volumes:
     db_vg: journals
 fsid: 40358a87-ab6e-4bdc-83db-1d909147861c
 generate_fsid: false
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/filestore-to-bluestore/container/group_vars/all b/tests/functional/filestore-to-bluestore/container/group_vars/all
index fc9067dc5c3e3919f83b03d7eb3e54b2564e2f59..b4a3832becdd6186a57df4a5c2e40f35b19e2474 100644 (file)
--- a/tests/functional/filestore-to-bluestore/container/group_vars/all
+++ b/tests/functional/filestore-to-bluestore/container/group_vars/all
@@ -22,6 +22,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 531fd6446789fd70ec44974ca35b6703c0b2d97b..6ef15658d26dd2547297ec03e05d320b751f10f6 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -25,6 +25,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 513bea3c30af60599dd0b74253498b4e0fc2a017..0224986067916ebc50c14723be31fb41dfc31c6c 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index bc5941341041952b1c5bb36487ec5fdd1a8110ee..17e9996ae625a44586ad3d2653d2eb3635c14580 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -42,6 +42,6 @@ openstack_cinder_pool:
 openstack_pools:
   - "{{ openstack_glance_pool }}"
   - "{{ openstack_cinder_pool }}"
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts
index 609478d50deb30db50de157d6c3846830040ac6f..0ea0ef4329076acf41f3ff242afe5a7bc9e782d5 100644 (file)
--- a/tests/functional/ooo-collocation/hosts
+++ b/tests/functional/ooo-collocation/hosts
@@ -9,9 +9,9 @@ all:
         rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0}
     ceph_mgr_docker_extra_env: '-e MGR_DASHBOARD=0'
     cluster: mycluster
-    ceph_docker_image: ceph-ci/daemon
+    ceph_docker_image: ceph/daemon
     ceph_docker_image_tag: latest-nautilus
-    ceph_docker_registry: quay.ceph.io
+    ceph_docker_registry: quay.io
     cephfs_data_pool:
       name: 'manila_data'
       pg_num: "{{ osd_pool_default_pg_num }}"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index aaf6f26369bb8d11a100b4d78820c74afd21b208..6174c6097adbb7cf8aa15ebbca771fe37cd6e53d 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -41,10 +41,10 @@ handler_health_mon_check_delay: 10
 handler_health_osd_check_delay: 10
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/rbdmirror/container/group_vars/all b/tests/functional/rbdmirror/container/group_vars/all
index 71de37c52b3679ef169d81a63251058c50de8b80..8427b3dc56f7606674d604fa56db5c7d02d2354c 100644 (file)
--- a/tests/functional/rbdmirror/container/group_vars/all
+++ b/tests/functional/rbdmirror/container/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-main
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/rbdmirror/container/secondary/group_vars/all b/tests/functional/rbdmirror/container/secondary/group_vars/all
index 93d4ad0f8f49f2ab8b8449f81de71bb094821a72..195a48333a2365b7ee6add52a7ba8c09c8e21e4c 100644 (file)
--- a/tests/functional/rbdmirror/container/secondary/group_vars/all
+++ b/tests/functional/rbdmirror/container/secondary/group_vars/all
@@ -27,6 +27,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-main
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-pacific

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 1e47a8d4893280fa4962acc6c72b5d632b0d067e..fd725d5f0dff521a69f8e27480ebffa64d24d0d8 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -26,6 +26,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index f37fd1c38c6ed78c8a4be80cba656340e2936a01..ccb3306b8ae2992c889a38423d78e5337f8a8cbc 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -26,6 +26,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
     mon_max_pg_per_osd: 512
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_mds/container/group_vars/all b/tests/functional/shrink_mds/container/group_vars/all
index 7e85132c7707cb9fb444d8fa8fd1f46f0fde369c..e29dbf6a816836fd423416e673b8f3b54aa05fbd 100644 (file)
--- a/tests/functional/shrink_mds/container/group_vars/all
+++ b/tests/functional/shrink_mds/container/group_vars/all
@@ -15,6 +15,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
index 44753fcd64b3af82cca385b852a11ab60da1aa2e..e933a050ea185a90eea11d7b874c26b559f7e695 100644 (file)
--- a/tests/functional/shrink_mgr/container/group_vars/all
+++ b/tests/functional/shrink_mgr/container/group_vars/all
@@ -14,6 +14,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index f549cebe0e457d46edf5b529cdd9a8e0317cb8ec..70bc4c9661a9de05417f8e7ae77fb9f0e73f03f6 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -14,6 +14,6 @@ ceph_conf_overrides:
     osd_pool_default_size: 1
 openstack_config: False
 dashboard_enabled: False
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index e99fedfe7f656d9031295c61f468dd7aabcb0341..74604ff56216866719b4d2b7f02a15bcbc30c8f4 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -15,6 +15,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_rbdmirror/container/group_vars/all b/tests/functional/shrink_rbdmirror/container/group_vars/all
index a95a0cf6c103402ebae55483099794799f31a54e..9247226d3cffe8ef43d11e86d0e6b4ce1e26e7c9 100644 (file)
--- a/tests/functional/shrink_rbdmirror/container/group_vars/all
+++ b/tests/functional/shrink_rbdmirror/container/group_vars/all
@@ -14,6 +14,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/shrink_rgw/container/group_vars/all b/tests/functional/shrink_rgw/container/group_vars/all
index 291e80ec5ec1c3f973373eeb4044896684c7c2eb..71b272b134bfdcda63322bc91bb0613efb97ca31 100644 (file)
--- a/tests/functional/shrink_rgw/container/group_vars/all
+++ b/tests/functional/shrink_rgw/container/group_vars/all
@@ -16,6 +16,6 @@ ceph_conf_overrides:
 openstack_config: False
 dashboard_enabled: False
 copy_admin_key: True
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
-ceph_docker_image_tag: latest-nautilus
\ No newline at end of file
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
+ceph_docker_image_tag: latest-nautilus

diff --git a/tests/functional/subset_update/container/group_vars/all b/tests/functional/subset_update/container/group_vars/all
index a3a038cd68f7c512198027913c1d0d99bcc4a65d..0f6b2e3626a6e8d5a7434285e2731c2ea1b4a64b 100644 (file)
--- a/tests/functional/subset_update/container/group_vars/all
+++ b/tests/functional/subset_update/container/group_vars/all
@@ -27,10 +27,10 @@ mds_max_mds: 2
 dashboard_enabled: false
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-ceph_docker_image: ceph-ci/daemon
+ceph_docker_registry: quay.io
+ceph_docker_image: ceph/daemon
 ceph_docker_image_tag: latest-nautilus
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:5.4.3"

diff --git a/tests/functional/subset_update/group_vars/all b/tests/functional/subset_update/group_vars/all
index a107e33d25b39c6f4f5618a164457bae5fbf3141..13725dd32cbd21871be24f62f1ae3c62595ab2f0 100644 (file)
--- a/tests/functional/subset_update/group_vars/all
+++ b/tests/functional/subset_update/group_vars/all
@@ -19,9 +19,9 @@ mds_max_mds: 2
 dashboard_enabled: false
 dashboard_admin_password: $sX!cD$rYU6qR^B!
 grafana_admin_password: +xFRe+RES@7vg24n
-ceph_docker_registry: quay.ceph.io
-node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.ceph.io/app-sre/grafana:6.7.4"
+ceph_docker_registry: quay.io
+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"
+grafana_container_image: "quay.io/ceph/ceph-grafana:6.7.4"
 grafana_server_group_name: ceph_monitoring

diff --git a/tests/library/test_ceph_key.py b/tests/library/test_ceph_key.py
index 6a8e78a0cdaee0b25ad4231e0ebef104700deeb6..199cf7f8eecc259b458d6403f4987809fc429392 100644 (file)
--- a/tests/library/test_ceph_key.py
+++ b/tests/library/test_ceph_key.py
@@ -101,8 +101,8 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_args = ['arg']
         fake_user = "fake-user"
-        fake_key = "/tmp/my-key"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_user_key = "/tmp/my-key"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = ['docker',
                                  'run',
                                  '--rm',
@@ -111,7 +111,7 @@ class TestCephKeyModule(object):
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                 'quay.io/ceph/daemon:latest-nautilus',
                                  '-n',
                                  "fake-user",
                                  '-k',
@@ -121,7 +121,7 @@ class TestCephKeyModule(object):
                                  'auth',
                                  'arg']
         result = ceph_key.generate_ceph_cmd(
-            fake_cluster, fake_args, fake_user, fake_key, fake_container_image)
+            fake_cluster, fake_args, fake_user, fake_user_key, fake_container_image)
         assert result == expected_command_list
 
     def test_generate_ceph_authtool_cmd_non_container_no_auid(self):
@@ -165,7 +165,7 @@ class TestCephKeyModule(object):
         fake_dest = "/fake/ceph"
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = ['docker',
                                  'run',
                                  '--rm',
@@ -174,7 +174,7 @@ class TestCephKeyModule(object):
                                  '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                  '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                  '--entrypoint=ceph-authtool',
-                                 'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                 'quay.io/ceph/daemon:latest-nautilus',
                                  '--create-keyring',
                                  fake_file_destination,
                                  '--name',
@@ -233,7 +233,7 @@ class TestCephKeyModule(object):
         fake_import_key = True
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = [
             ['docker',
              'run',
@@ -243,7 +243,7 @@ class TestCephKeyModule(object):
              '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
              '-v', '/var/log/ceph/:/var/log/ceph/:z',
              '--entrypoint=ceph-authtool',
-             'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+             'quay.io/ceph/daemon:latest-nautilus',
              '--create-keyring', fake_file_destination,
              '--name', fake_name,
              '--add-key', fake_secret,
@@ -257,7 +257,7 @@ class TestCephKeyModule(object):
              '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
              '-v', '/var/log/ceph/:/var/log/ceph/:z',
              '--entrypoint=ceph',
-             'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+             'quay.io/ceph/daemon:latest-nautilus',
              '-n', 'client.admin',
              '-k', '/etc/ceph/fake.client.admin.keyring',
              '--cluster', fake_cluster,
@@ -320,8 +320,8 @@ class TestCephKeyModule(object):
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
         # create_key passes (one for ceph-authtool and one for itself) itw own array so the expected result is an array within an array # noqa E501
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
-        expected_command_list = [['docker',
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
+        expected_command_list = [['docker',   # noqa E128
                                   'run',
                                   '--rm',
                                   '--net=host',
@@ -329,7 +329,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph-authtool',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '--create-keyring',
                                   fake_file_destination,
                                   '--name',
@@ -363,7 +363,7 @@ class TestCephKeyModule(object):
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
         fake_cluster = "fake"
         fake_name = "client.fake"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -372,7 +372,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '-n', 'client.admin',
                                   '-k', '/etc/ceph/fake.client.admin.keyring',
                                   '--cluster', fake_cluster,
@@ -402,7 +402,7 @@ class TestCephKeyModule(object):
         fake_name = "client.fake"
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = [['docker',   # noqa E128
                                   'run',
                                   '--rm',
@@ -411,7 +411,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '-n', fake_user,
                                   '-k', fake_user_key,
                                   '--cluster', fake_cluster,
@@ -437,7 +437,7 @@ class TestCephKeyModule(object):
         fake_user = 'client.admin'
         fake_user_key = '/etc/ceph/fake.client.admin.keyring'
         fake_name = "client.fake"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         fake_dest = "/fake/ceph"
         fake_keyring_filename = fake_cluster + "." + fake_name + ".keyring"
         fake_file_destination = os.path.join(fake_dest, fake_keyring_filename)
@@ -449,7 +449,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '-n', fake_user,
                                   '-k', fake_user_key,
                                   '--cluster', fake_cluster,
@@ -494,7 +494,7 @@ class TestCephKeyModule(object):
         fake_user = "mon."
         fake_keyring_dirname = fake_cluster + "-" + fake_hostname
         fake_key = os.path.join("/var/lib/ceph/mon/", fake_keyring_dirname, 'keyring')
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -503,7 +503,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '-n', "mon.",
                                   '-k', "/var/lib/ceph/mon/fake-mon01/keyring",
                                   '--cluster', fake_cluster,
@@ -516,7 +516,7 @@ class TestCephKeyModule(object):
         fake_cluster = "fake"
         fake_user = "fake-user"
         fake_key = "/tmp/my-key"
-        fake_container_image = "quay.ceph.io/ceph-ci/daemon:latest-nautilus"
+        fake_container_image = "quay.io/ceph/daemon:latest-nautilus"
         expected_command_list = [['docker',
                                   'run',
                                   '--rm',
@@ -525,7 +525,7 @@ class TestCephKeyModule(object):
                                   '-v', '/var/lib/ceph/:/var/lib/ceph/:z',
                                   '-v', '/var/log/ceph/:/var/log/ceph/:z',
                                   '--entrypoint=ceph',
-                                  'quay.ceph.io/ceph-ci/daemon:latest-nautilus',
+                                  'quay.io/ceph/daemon:latest-nautilus',
                                   '-n', "fake-user",
                                   '-k', "/tmp/my-key",
                                   '--cluster', fake_cluster,

diff --git a/tests/library/test_ceph_osd_flag.py b/tests/library/test_ceph_osd_flag.py
index 8ada6a92a2425be6621868df73c20c67c1e2bafa..e2977635bdb362b314babc31c6b199cfa9d13620 100644 (file)
--- a/tests/library/test_ceph_osd_flag.py
+++ b/tests/library/test_ceph_osd_flag.py
@@ -8,7 +8,7 @@ import ceph_osd_flag
 
 fake_cluster = 'ceph'
 fake_container_binary = 'podman'
-fake_container_image = 'quay.ceph.io/ceph/daemon:latest'
+fake_container_image = 'quay.io/ceph/daemon:latest'
 fake_flag = 'noup'
 fake_user = 'client.admin'
 fake_keyring = '/etc/ceph/{}.{}.keyring'.format(fake_cluster, fake_user)

diff --git a/tox-update.ini b/tox-update.ini
index e179330aa5f4008d00ac8d8cc001bf41d94f127c..564c9c0252ab6a536cafe8c0d3be049ea045f369 100644 (file)
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -50,8 +50,8 @@ commands=
   bash -c 'ANSIBLE_CONFIG={envdir}/tmp/ceph-ansible/ansible.cfg ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/hosts-upgrade-to-nautilus {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
       ceph_stable_release=luminous \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \
   "'
 

diff --git a/tox.ini b/tox.ini
index f6576a3c9b8caa2b98ee2c76ccc7ca32aea99d04..acba991c66907d62048831faaee552672f8842f7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
       ceph_stable_release=luminous \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
   "
@@ -56,7 +56,7 @@ commands=
   # migrate osds to ceph-volume and upgrade to nautilus
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
       ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag=latest-nautilus \
       osd_scenario=lvm \
@@ -132,8 +132,8 @@ commands=
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/purge-dashboard.yml --extra-vars "\
       ireallymeanit=yes \
-      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.ceph.io} \
-      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph-ci/daemon} \
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:quay.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-nautilus} \
   "