From ffd05ca8dfd7c6032face7350f1ae905cd0e0cdf Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 24 Oct 2019 11:07:20 -0400 Subject: [PATCH] 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 (cherry picked from commit b33c476f16a17abaedc5f4a31e37fbed121b968e) --- group_vars/all.yml.sample | 2 ++ group_vars/rhcs.yml.sample | 2 ++ roles/ceph-defaults/defaults/main.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 8e5fa4534..f629522cb 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -571,6 +571,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 122113533..0987941a7 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -571,6 +571,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 5d68b7efc..d64b8e917 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -563,6 +563,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 }}"