Remove trailing forward slash in ceph_docker_registry variable from group_vars/rhcs...

Also fixed rhcs_edits.txt for variable ceph_docker_registry.

Moved namespace to ceph_docker_image variable.

Signed-off-by: Phuong Nguyen <pnguyen@redhat.com>
(cherry picked from commit 3305309e87b16c42af5f7faf35fd322241e8e964)

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 314576ca7bd8f8931e2dbf111878b5617cc424e7..f4fe636bd3ee10d4b04534f1642a9433e8a81a32 100644 (file)
--- 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 897e912ada006eb3491bdea41758b433752cb458..ad1b6203437e6f2bcc739a23ebc96de2de9372ff 100644 (file)
--- 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