From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 24 Oct 2019 15:07:20 +0000 (-0400)
Subject: defaults: add user/pass auth registry variables
X-Git-Tag: v5.0.0alpha1~17
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b33c476f16a17abaedc5f4a31e37fbed121b968e;p=ceph-ansible.git

defaults: add user/pass auth registry variables

Add ceph_docker_registry_username and ceph_docker_registry_password
variables in ceph-defaults role so they will be present in the group_vars
samples but commented.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1763139

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
---

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index a1f5b807c..0b93d04e2 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -573,6 +573,8 @@ dummy:
 #ceph_docker_image_tag: latest
 #ceph_docker_registry: docker.io
 #ceph_docker_registry_auth: false
+#ceph_docker_registry_username:
+#ceph_docker_registry_password:
 ## Client only docker image - defaults to {{ ceph_docker_image }}
 #ceph_client_docker_image: "{{ ceph_docker_image }}"
 #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index da539ab73..315db4f7a 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -573,6 +573,8 @@ ceph_docker_image: "rhceph/rhceph-4-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"
 ceph_docker_registry_auth: true
+#ceph_docker_registry_username:
+#ceph_docker_registry_password:
 ## Client only docker image - defaults to {{ ceph_docker_image }}
 #ceph_client_docker_image: "{{ ceph_docker_image }}"
 #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 75ff1b16e..aac5b235a 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -565,6 +565,8 @@ ceph_docker_image: "ceph/daemon"
 ceph_docker_image_tag: latest
 ceph_docker_registry: docker.io
 ceph_docker_registry_auth: false
+#ceph_docker_registry_username:
+#ceph_docker_registry_password:
 ## Client only docker image - defaults to {{ ceph_docker_image }}
 ceph_client_docker_image: "{{ ceph_docker_image }}"
 ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"