mirror of https://github.com/ceph/ceph-ansible.git
use ceph_docker_registry in all the roles instead of docker.io
This allows for ceph-ansible to use other docker registries.
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 9449dbf083
)
pull/1237/head
parent
77a8a1f71b
commit
12d9d2dca5
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry }}/{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
run_once: true
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry }}/{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
run_once: true
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry }}/{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
run_once: true
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry }}/{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
run_once: true
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry}}/{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
always_run: true
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry}}/{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
run_once: true
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# NOTE (leseb): we can not use docker inspect with 'format filed' because of
|
||||
# https://github.com/ansible/ansible/issues/10156
|
||||
- name: inspect ceph version
|
||||
shell: docker inspect "docker.io/{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
shell: docker inspect "{{ ceph_docker_registry }}/{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
|
||||
changed_when: false
|
||||
failed_when: false
|
||||
always_run: true
|
||||
|
|
Loading…
Reference in New Issue