docker: do not hardcode image and user name

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/708/head
Sébastien Han 2016-04-12 12:01:53 +02:00
parent 8959ab1843
commit 7424ad6d68
5 changed files with 5 additions and 5 deletions

View File

@ -7,7 +7,7 @@
# NOTE (leseb): we can not use docker inspect with 'format filed' because of # NOTE (leseb): we can not use docker inspect with 'format filed' because of
# https://github.com/ansible/ansible/issues/10156 # https://github.com/ansible/ansible/issues/10156
- name: inspect ceph version - 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 changed_when: false
failed_when: false failed_when: false
run_once: true run_once: true

View File

@ -7,7 +7,7 @@
# NOTE (leseb): we can not use docker inspect with 'format filed' because of # NOTE (leseb): we can not use docker inspect with 'format filed' because of
# https://github.com/ansible/ansible/issues/10156 # https://github.com/ansible/ansible/issues/10156
- name: inspect ceph version - 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 changed_when: false
failed_when: false failed_when: false
run_once: true run_once: true

View File

@ -7,7 +7,7 @@
# NOTE (leseb): we can not use docker inspect with 'format filed' because of # NOTE (leseb): we can not use docker inspect with 'format filed' because of
# https://github.com/ansible/ansible/issues/10156 # https://github.com/ansible/ansible/issues/10156
- name: inspect ceph version - 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 changed_when: false
failed_when: false failed_when: false
run_once: true run_once: true

View File

@ -1,6 +1,6 @@
--- ---
- name: inspect ceph version - 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 changed_when: false
failed_when: false failed_when: false
run_once: true run_once: true

View File

@ -7,7 +7,7 @@
# NOTE (leseb): we can not use docker inspect with 'format filed' because of # NOTE (leseb): we can not use docker inspect with 'format filed' because of
# https://github.com/ansible/ansible/issues/10156 # https://github.com/ansible/ansible/issues/10156
- name: inspect ceph version - 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 changed_when: false
failed_when: false failed_when: false
run_once: true run_once: true