container/dashboard: run the registry auth task

When deploying with packages then the ceph-container-common role isn't
executed so the registry authentication task is ignored.

Closes: #4636
Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 9ad000618ff7be9967bbdae2b1c5cfc0793efe26)

diff --git a/dashboard.yml b/dashboard.yml
index 979ed49277f6ab09ef4b029d7732cb6215830ba5..1865e478f45c31185e4c02074ed62c193ee28627 100644 (file)
--- a/dashboard.yml
+++ b/dashboard.yml
@@ -20,6 +20,12 @@
       tags: ['ceph_update_config']
     - import_role:
         name: ceph-container-engine
+    - import_role:
+        name: ceph-container-common
+        tasks_from: registry
+      when:
+        - not containerized_deployment | bool
+        - ceph_docker_registry_auth | bool
     - import_role:
         name: ceph-node-exporter
 

diff --git a/roles/ceph-container-common/tasks/main.yml b/roles/ceph-container-common/tasks/main.yml
index 7859ec2e6584ce2fbbc8f9f7a85fad7ad5ca16ae..f575b2fb62cce485e07e6d1cdfcc6314eefd34a3 100644 (file)
--- a/roles/ceph-container-common/tasks/main.yml
+++ b/roles/ceph-container-common/tasks/main.yml
@@ -15,10 +15,8 @@
         ceph_docker_version: "{{ ceph_docker_version.stdout.split(' ')[2] }}"
   when: container_binary == 'docker'
 
-- name: container registry authentication
-  command: '{{ container_binary }} login -u {{ ceph_docker_registry_username }} -p {{ ceph_docker_registry_password }} {{ ceph_docker_registry }}'
-  changed_when: false
-  no_log: true
+- name: include registry.yml
+  include_tasks: registry.yml
   when: ceph_docker_registry_auth | bool
 
 - name: include fetch_image.yml

diff --git a/roles/ceph-container-common/tasks/registry.yml b/roles/ceph-container-common/tasks/registry.yml
new file mode 100644 (file)
index 0000000..4d757ad
--- /dev/null
+++ b/roles/ceph-container-common/tasks/registry.yml
@@ -0,0 +1,5 @@
+---
+- name: container registry authentication
+  command: '{{ container_binary }} login -u {{ ceph_docker_registry_username }} -p {{ ceph_docker_registry_password }} {{ ceph_docker_registry }}'
+  changed_when: false
+  no_log: true