From 274bf3e038aa43dabc330ccf5183e7b3f7441a31 Mon Sep 17 00:00:00 2001 From: Phuong Nguyen Date: Wed, 6 Mar 2019 13:38:50 +1100 Subject: [PATCH] Remove trailing forward slash in ceph_docker_registry variable from group_vars/rhcs.yml.sample file. Also fixed rhcs_edits.txt for variable ceph_docker_registry. Moved namespace to ceph_docker_image variable. Signed-off-by: Phuong Nguyen (cherry picked from commit 3305309e87b16c42af5f7faf35fd322241e8e964) --- group_vars/rhcs.yml.sample | 4 ++-- rhcs_edits.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 314576ca7..f4fe636bd 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -540,9 +540,9 @@ ceph_rhcs_version: 3 ########## #docker_exec_cmd: #docker: false -ceph_docker_image: "rhceph-3-rhel7" +ceph_docker_image: "rhceph/rhceph-3-rhel7" ceph_docker_image_tag: "latest" -ceph_docker_registry: "registry.access.redhat.com/rhceph/" +ceph_docker_registry: "registry.access.redhat.com" ## 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/rhcs_edits.txt b/rhcs_edits.txt index 897e912ad..ad1b62034 100644 --- a/rhcs_edits.txt +++ b/rhcs_edits.txt @@ -2,7 +2,7 @@ ceph_repository: rhcs ceph_origin: repository fetch_directory: ~/ceph-ansible-keys ceph_rhcs_version: 3 -ceph_docker_image: "rhceph-3-rhel7" +ceph_docker_image: "rhceph/rhceph-3-rhel7" ceph_docker_image_tag: "latest" -ceph_docker_registry: "registry.access.redhat.com/rhceph/" +ceph_docker_registry: "registry.access.redhat.com" # END OF FILE, DO NOT TOUCH ME! \ No newline at end of file