From 7424ad6d683f232838d22243f6988637676e5658 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 12 Apr 2016 12:01:53 +0200 Subject: [PATCH] docker: do not hardcode image and user name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- roles/ceph-mds/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-mon/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-osd/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-restapi/tasks/docker/dirs_permissions.yml | 2 +- roles/ceph-rgw/tasks/docker/dirs_permissions.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/ceph-mds/tasks/docker/dirs_permissions.yml b/roles/ceph-mds/tasks/docker/dirs_permissions.yml index ba5818294..258a17967 100644 --- a/roles/ceph-mds/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mds/tasks/docker/dirs_permissions.yml @@ -7,7 +7,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/daemon | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq + shell: docker inspect docker.io/"{{ ceph_mds_docker_username }}"/"{{ ceph_mds_docker_imagename }}" | 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 a33a38edf..99f1e9a4f 100644 --- a/roles/ceph-mon/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mon/tasks/docker/dirs_permissions.yml @@ -7,7 +7,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/daemon | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq + shell: docker inspect docker.io/"{{ ceph_mon_docker_username }}"/"{{ ceph_mon_docker_imagename }}" | 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 d0c49cf9c..785f06898 100644 --- a/roles/ceph-osd/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-osd/tasks/docker/dirs_permissions.yml @@ -7,7 +7,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/daemon | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq + shell: docker inspect docker.io/"{{ ceph_osd_docker_username }}"/"{{ ceph_osd_docker_imagename }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq changed_when: false failed_when: false run_once: true diff --git a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml index 99dbe4094..aba95709f 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 --format '{{ index (index .Config.Env) 3 }}' docker.io/{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }} | cut -d '=' -f '2'" + shell: docker inspect docker.io/"{{ ceph_restapi_docker_username }}"/"{{ ceph_restapi_docker_imagename }}" | 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 d4046e616..8d53d815a 100644 --- a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml @@ -7,7 +7,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/daemon | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq + shell: docker inspect docker.io/"{{ ceph_rgw_docker_username }}"/"{{ ceph_rgw_docker_imagename }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq changed_when: false failed_when: false run_once: true -- 2.39.5