From 9449dbf083a0810eaeb8c172a9f1bfb3d46574da Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 16 Jan 2017 09:52:20 -0600 Subject: [PATCH] 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 --- roles/ceph-mds/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-mon/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-nfs/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-osd/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-restapi/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-rgw/tasks/docker/dirs_permissions.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/ceph-mds/tasks/docker/dirs_permissions.yml b/roles/ceph-mds/tasks/docker/dirs_permissions.yml index b126f9172..65fff99c6 100644 --- a/roles/ceph-mds/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mds/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-mon/tasks/docker/dirs_permissions.yml b/roles/ceph-mon/tasks/docker/dirs_permissions.yml index e24e0f3bb..b5bff1b60 100644 --- a/roles/ceph-mon/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mon/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-nfs/tasks/docker/dirs_permissions.yml b/roles/ceph-nfs/tasks/docker/dirs_permissions.yml index e4456bd8e..4a5af37b6 100644 --- a/roles/ceph-nfs/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-nfs/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-osd/tasks/docker/dirs_permissions.yml b/roles/ceph-osd/tasks/docker/dirs_permissions.yml index cdafab0c7..979416376 100644 --- a/roles/ceph-osd/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-osd/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml b/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml index dedc4948d..55e25ce04 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml index e291f61d1..3f0ae5a10 100644 --- a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml @@ -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 diff --git a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml index a80902a48..cb4c39c78 100644 --- a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml @@ -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