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 <pnguyen@redhat.com>
(cherry picked from commit 3305309e87)
pull/3725/head
Phuong Nguyen 2019-03-06 13:38:50 +11:00 committed by mergify[bot]
parent d3f6556041
commit 274bf3e038
2 changed files with 4 additions and 4 deletions

View File

@ -540,9 +540,9 @@ ceph_rhcs_version: 3
########## ##########
#docker_exec_cmd: #docker_exec_cmd:
#docker: false #docker: false
ceph_docker_image: "rhceph-3-rhel7" ceph_docker_image: "rhceph/rhceph-3-rhel7"
ceph_docker_image_tag: "latest" 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 }} ## Client only docker image - defaults to {{ ceph_docker_image }}
#ceph_client_docker_image: "{{ ceph_docker_image }}" #ceph_client_docker_image: "{{ ceph_docker_image }}"
#ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}" #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"

View File

@ -2,7 +2,7 @@ ceph_repository: rhcs
ceph_origin: repository ceph_origin: repository
fetch_directory: ~/ceph-ansible-keys fetch_directory: ~/ceph-ansible-keys
ceph_rhcs_version: 3 ceph_rhcs_version: 3
ceph_docker_image: "rhceph-3-rhel7" ceph_docker_image: "rhceph/rhceph-3-rhel7"
ceph_docker_image_tag: "latest" 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! # END OF FILE, DO NOT TOUCH ME!