]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Support for docker image tags 878/head
authorIvan Font <ivan.font@redhat.com>
Sat, 9 Jul 2016 01:38:13 +0000 (18:38 -0700)
committerIvan Font <ivan.font@redhat.com>
Tue, 12 Jul 2016 22:49:07 +0000 (15:49 -0700)
Signed-off-by: Ivan Font <ivan.font@redhat.com>
37 files changed:
group_vars/all.docker.sample
group_vars/mdss.sample
group_vars/mons.sample
group_vars/nfss.sample
group_vars/osds.sample
group_vars/restapis.sample
group_vars/rgws.sample
roles/ceph-common/tasks/docker/fetch_image.yml
roles/ceph-mds/defaults/main.yml
roles/ceph-mds/tasks/docker/dirs_permissions.yml
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/tasks/docker/start_docker_mds.yml
roles/ceph-mds/templates/ceph-mds.service.j2
roles/ceph-mon/defaults/main.yml
roles/ceph-mon/tasks/docker/dirs_permissions.yml
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/start_docker_monitor.yml
roles/ceph-mon/templates/ceph-mon.service.j2
roles/ceph-nfs/defaults/main.yml
roles/ceph-nfs/tasks/docker/dirs_permissions.yml
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
roles/ceph-nfs/templates/ceph-nfs.service.j2
roles/ceph-osd/defaults/main.yml
roles/ceph-osd/tasks/docker/dirs_permissions.yml
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/start_docker_osd.yml
roles/ceph-osd/templates/ceph-osd.service.j2
roles/ceph-restapi/defaults/main.yml
roles/ceph-restapi/tasks/docker/dirs_permissions.yml
roles/ceph-restapi/tasks/docker/main.yml
roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
roles/ceph-rgw/defaults/main.yml
roles/ceph-rgw/tasks/docker/dirs_permissions.yml
roles/ceph-rgw/tasks/docker/main.yml
roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
roles/ceph-rgw/templates/ceph-rgw.service.j2

index 120608e50a66a076526ea41c089cdd54eed02b2d..eb1943af2bcb7968bf05dfda0de9f069e97b5f7c 100644 (file)
@@ -18,6 +18,7 @@ dummy:
 #mon_docker_privileged: true
 #ceph_mon_docker_username: ceph
 #ceph_mon_docker_imagename: daemon
+#ceph_mon_docker_image_tag: latest
 #ceph_mon_docker_interface: "{{ monitor_interface }}"
 #ceph_mon_docker_subnet: "{{ public_network }}" # subnet of the ceph_mon_docker_interface
 #ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
@@ -31,6 +32,7 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
+#ceph_osd_docker_image_tag: latest
 #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
 #ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1" # comma separated variables
 #ceph_osd_docker_devices:
@@ -46,6 +48,7 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #ceph_mds_docker_username: ceph
 #ceph_mds_docker_imagename: daemon
+#ceph_mds_docker_image_tag: latest
 #ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables
 
 #######
@@ -57,6 +60,7 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #ceph_rgw_docker_username: ceph
 #ceph_rgw_docker_imagename: daemon
+#ceph_rgw_docker_image_tag: latest
 #ceph_rgw_civetweb_port: 80
 #ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
 
@@ -68,4 +72,5 @@ dummy:
 #ceph_restapi_port: 5000
 #ceph_restapi_docker_username: ceph
 #ceph_restapi_docker_imagename: daemon
+#ceph_restapi_docker_image_tag: latest
 #ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
index a7da9c5140f338c4f3e3600b856b970360a7a1e8..308ac192ea0ea1911ef9fff78574c2553552334d 100644 (file)
@@ -34,6 +34,7 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #ceph_mds_docker_username: ceph
 #ceph_mds_docker_imagename: daemon
+#ceph_mds_docker_image_tag: latest
 #ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables
 #ceph_docker_on_openstack: false
 
index 784cdcb901ce8a76a7424fe26cb6aac8f6907fd5..9e40b98504f50d45cbd9ba613a284eafbda10202 100644 (file)
@@ -77,6 +77,7 @@ dummy:
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
 #ceph_mon_docker_username: ceph
 #ceph_mon_docker_imagename: daemon
+#ceph_mon_docker_image_tag: latest
 #ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
 #ceph_docker_on_openstack: false
 #mon_docker_privileged: false
index f2f2353dc7b05749ae747e8e5dc81c492684119c..8e378d24735e88bf87593792d50d37398bb4349f 100644 (file)
@@ -64,5 +64,7 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #ceph_nfs_docker_username: ceph
 #ceph_nfs_docker_imagename: ganesha
+#ceph_nfs_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: "GANESHA_EPOCH={{ ganesha_epoch }}" # comma separated variables
 #ceph_docker_on_openstack: false
+
index a6ba6d678be3d05459d0ed478195b2539d906c20..7fb63f381f185d0b3fd8784c7a0ee80bc5ff4032 100644 (file)
@@ -134,6 +134,7 @@ dummy:
 #ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
+#ceph_osd_docker_image_tag: latest
 #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
 #ceph_osd_docker_devices:
 # - /dev/sdb
index e58bfbb315842b41cdb8bbc6feab57dbc31e407e..f21cbcef7f4e364a86c4c0106ec8910a38b4b37f 100644 (file)
@@ -23,6 +23,7 @@ dummy:
 #ceph_restapi_port: 5000
 #ceph_restapi_docker_username: ceph
 #ceph_restapi_docker_imagename: daemon
+#ceph_restapi_docker_image_tag: latest
 #ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
 #ceph_docker_on_openstack: false
 
index 9f87fcafb6d45804cd37d49b2fec96dca7bca5d1..3916c9ab76cc8ca1785fdb165cd19111c05bd0b8 100644 (file)
@@ -41,6 +41,7 @@ dummy:
 #ceph_rgw_civetweb_port: 80
 #ceph_rgw_docker_username: ceph
 #ceph_rgw_docker_imagename: daemon
+#ceph_rgw_docker_image_tag: latest
 #ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
 #ceph_docker_on_openstack: false
 
index 646a27d1291dc206115a5d2f7b85b0272c84cbf0..0e2757da94fa592432e962b6c9196396615957da 100644 (file)
@@ -1,26 +1,26 @@
 ---
 # Normal case - pull image from registry
 - name: pull ceph daemon image
-  command: "docker pull {{ ceph_docker_username }}/{{ ceph_docker_imagename }}"
+  command: "docker pull {{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
   changed_when: false
   when: ceph_docker_dev_image is undefined or not ceph_docker_dev_image
 
 # Dev case - export local dev image and send it across
 - name: export local ceph dev image
-  local_action: command docker save -o "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}.tar" "{{ ceph_docker_username }}/{{ ceph_docker_imagename }}"
+  local_action: command docker save -o "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar" "{{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
   when: ceph_docker_dev_image is defined and ceph_docker_dev_image
   run_once: true
 
 - name: copy ceph dev image file
   copy:
-    src: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}.tar"
-    dest: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}.tar"
+    src: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
+    dest: "/tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
   when: ceph_docker_dev_image is defined and ceph_docker_dev_image
 
 - name: load ceph dev image
-  command: "docker load -i /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}.tar"
+  command: "docker load -i /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
   when: ceph_docker_dev_image is defined and ceph_docker_dev_image
 
 - name: remove tmp ceph dev image file
-  command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}.tar"
+  command: "rm /tmp/{{ ceph_docker_username }}-{{ ceph_docker_imagename }}-{{ ceph_docker_image_tag }}.tar"
   when: ceph_docker_dev_image is defined and ceph_docker_dev_image
index 15ed08e9100b4e0362a03f3229ef274317d347f4..c20bc7c4f8947d6febf4c02778dc60ce210edcb8 100644 (file)
@@ -26,5 +26,6 @@ kv_type: etcd
 kv_endpoint: 127.0.0.1
 ceph_mds_docker_username: ceph
 ceph_mds_docker_imagename: daemon
+ceph_mds_docker_image_tag: latest
 ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables
 ceph_docker_on_openstack: false
index fcf4e5423ea6112c2b182391f710f26e9ef9079b..e7ef2907fbeb97e9eb656ca4b67d104bf2520037 100644 (file)
@@ -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 }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index b51cdf8cb8e362e8e69a6ef0586ca157a7ae2fc7..bfe86f39dca8289ca0dffcb24dad7ad2a48c0b14 100644 (file)
@@ -19,8 +19,9 @@
 - include: pre_requisite.yml
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_mds_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_mds_docker_imagename}}'
+    ceph_docker_username: "{{ ceph_mds_docker_username }}"
+    ceph_docker_imagename: "{{ ceph_mds_docker_imagename }}"
+    ceph_docker_image_tag: "{{ ceph_mds_docker_image_tag }}"
 - include: dirs_permissions.yml
 - include: fetch_configs.yml
 
index 819a14c1644c145f5f37b13e5351d4ea0ad6dce7..9f3a7b68ccec77dce0376f34197831f487591db5 100644 (file)
@@ -39,7 +39,7 @@
 
 - name: run the ceph metadata docker image
   docker:
-    image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}"
+    image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}"
     name: ceph-{{ ansible_hostname }}-mds
     net: host
     state: running
index 6c0747128baaf57e7075530b685046fcfcbec2c0..283183d5679f5b5702f77f56949d54ba9ce851bf 100644 (file)
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    -e CEPHFS_CREATE=1 \
    -e {{ ceph_mds_docker_extra_env }} \
    --name={{ ansible_hostname }} \
-   {{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}
+   {{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s
index b8a496a96e1ab0d76ba84db94e4366703259a0c8..2f235ad44b8aa3b848d049ad01deae3165e19b9b 100644 (file)
@@ -69,7 +69,7 @@ ceph_mon_docker_interface: eth0
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface
 ceph_mon_docker_username: ceph
 ceph_mon_docker_imagename: daemon
-ceph_mon_docker_tag: latest
+ceph_mon_docker_image_tag: latest
 ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
 ceph_docker_on_openstack: false
 mon_docker_privileged: false
index 7a9e83e8a68ee6bb74af4afdae4f4a460db4df13..0742c9c70cd6dcb1f5240d40d84d4dbe33c88096 100644 (file)
@@ -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 }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index b7b1931e1911c8f3d7bc2dd67aab2071f2416220..d2fc4f8ab9ea884ff8c73b1e2f42389f32b7df4f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_mon_docker_username}}/{{ceph_mon_docker_imagename}}'"
+  shell: "docker ps | grep -sq '{{ceph_mon_docker_username}}/{{ceph_mon_docker_imagename}}:{{ceph_mon_docker_image_tag}}'"
   register: ceph_health
   changed_when: false
   failed_when: false
@@ -22,8 +22,9 @@
 
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_mon_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_mon_docker_imagename}}'
+    ceph_docker_username: "{{ ceph_mon_docker_username }}"
+    ceph_docker_imagename: "{{ ceph_mon_docker_imagename }}"
+    ceph_docker_image_tag: "{{ ceph_mon_docker_image_tag }}"
 
 - include: dirs_permissions.yml
 
index 8e85db1ba64c78bbb217b7ec219ed6692b310412..7072a2e251a4d40448c118a60c0a24b277325114 100644 (file)
@@ -2,7 +2,7 @@
 - name: populate kv_store with default ceph.conf
   docker:
     name: populate-kv-store
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
     command: populate_kvstore
     net: host
     env:
@@ -18,7 +18,7 @@
 - name: populate kv_store with custom ceph.conf
   docker:
     name: populate-kv-store
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
     command: populate_kvstore
     net: host
     env:
@@ -37,7 +37,7 @@
   docker:
     name: populate-kv-store
     state: absent
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
   when: mon_containerized_deployment_with_kv
 
 # Use systemd to manage container on Atomic host and CoreOS
@@ -79,7 +79,7 @@
 
 - name: run the ceph monitor docker image
   docker:
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
@@ -93,7 +93,7 @@
 
 - name: run the ceph monitor docker image with kv
   docker:
-    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}"
+    image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
index 292089b7fd91be441ceaec7558e2aa5e6ec668a8..93c5a66adef44690c5ca0accce73729b9da41459 100644 (file)
@@ -25,7 +25,7 @@ ExecStart=/usr/bin/docker run --rm --name %i --net=host \
    -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }} \
    -e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \
    -e MON_NAME={{ ansible_hostname }} \
-    {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_tag }}
+    {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s
index 1c725c1ecb09ea1194204e22d212a1dc13f8a064..64f643e5ef1d25e6927b6be261bbc24c715f864d 100644 (file)
@@ -56,5 +56,6 @@ kv_type: etcd
 kv_endpoint: 127.0.0.1
 ceph_nfs_docker_username: ceph
 ceph_nfs_docker_imagename: ganesha
+ceph_nfs_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: "GANESHA_EPOCH={{ ganesha_epoch }}" # comma separated variables
 ceph_docker_on_openstack: false
index b58687d0a84658c90bc627f0142a17438f357e38..87ca765d71db4ee45ab1dc2f8679c00806e4efc7 100644 (file)
@@ -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 }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index e2e000e10a94d2841988fe245a4ebc79e3a85d90..ae9a3cb21c99f3eec402ebffd925937489cf2918 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_nfs_docker_username}}/{{ceph_nfs_docker_imagename}}'"
+  shell: "docker ps | grep -sq '{{ceph_nfs_docker_username}}/{{ceph_nfs_docker_imagename}}:{{ceph_nfs_docker_image_tag}}'"
   register: ceph_health
   changed_when: false
   failed_when: false
@@ -22,8 +22,9 @@
 
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_nfs_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_nfs_docker_imagename}}'
+    ceph_docker_username: "{{ ceph_nfs_docker_username }}"
+    ceph_docker_imagename: "{{ ceph_nfs_docker_imagename }}"
+    ceph_docker_image_tag: "{{ ceph_nfs_docker_image_tag }}"
 
 - include: dirs_permissions.yml
 
index 78d3f166f33ac44d0c54544a720b6ee3f706d554..77a5a9604eba32f5205481f2e2d16a3f17d729d8 100644 (file)
@@ -54,7 +54,7 @@
 
 - name: run the ceph NFS docker image
   docker:
-    image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}"
+    image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
@@ -69,7 +69,7 @@
 
 - name: run the ceph NFS docker image with kv
   docker:
-    image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}"
+    image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}"
     name: "{{ ansible_hostname }}"
     net: "host"
     state: "running"
index 1552cad5dfdd75040b6b8aa12cddeffc880a8950..d78d2d0d253d9af7bbc184c0554d27be236b9622 100644 (file)
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run --rm --name %i --net=host \
    -e CEPH_DAEMON=NFS \
    -e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \
    --name={{ ansible_hostname }} \
-    {{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}
+    {{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s
index 7f2c9a2c36be7001496a5c301cf905c7f7402e54..2a4e6f58cdeb96ec026140981683a357269a33ad 100644 (file)
@@ -126,6 +126,7 @@ kv_endpoint: 127.0.0.1
 ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 ceph_osd_docker_username: ceph
 ceph_osd_docker_imagename: daemon
+ceph_osd_docker_image_tag: latest
 ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables
 #ceph_osd_docker_devices:
 # - /dev/sdb
index 4c14f15563c81f4b4b3d9400881e4f7bfd4b4418..986e4498f16314a5a30c550e56501c8c4dce5672 100644 (file)
@@ -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 }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index f7fbc0686193aaf6e621d5cfeba52c67fd5779a2..6db55a173a923636125506265fa9726f5c1d85a6 100644 (file)
@@ -22,8 +22,9 @@
 
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_osd_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_osd_docker_imagename}}'
+    ceph_docker_username: '{{ ceph_osd_docker_username }}'
+    ceph_docker_imagename: '{{ ceph_osd_docker_imagename }}'
+    ceph_docker_image_tag: '{{ ceph_osd_docker_image_tag }}'
 
 # NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
 # because it creates the directories needed by the latter.
index 3e5910d2ce0fd87705bb7d02e9efaf333b36f019..bc214eee793b6d8c97ffe665e0a0f70a1a6c068e 100644 (file)
@@ -30,7 +30,7 @@
     -v /dev:/dev \
     -e "OSD_DEVICE={{ item.0 }}" \
     -e "{{ ceph_osd_docker_prepare_env }}" \
-    "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}" \
+    "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" \
     OSD_CEPH_DISK_PREPARE
   with_together:
     - ceph_osd_docker_devices
@@ -42,7 +42,7 @@
 
 - name: prepare ceph osd disk with kv_store
   docker:
-    image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
+    image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
     name: "{{ ansible_hostname }}-osd-prepare-{{ item.0 | regex_replace('/', '') }}"
     net: host
     pid: host
index 5f7dc598384e70216bad42c52316e9fdc8ad768d..7ca3826da62ab30f3fa50c18b188af830ce973d6 100644 (file)
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run --rm --net=host --pid=host\
    -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE \
    -e OSD_DEVICE=/dev/%i \
    --name={{ ansible_hostname }}-osd-dev%i \
-   {{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}
+   {{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}
 ExecStop=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
 Restart=always
 RestartSec=10s
@@ -27,4 +27,4 @@ TimeoutStartSec=120
 TimeoutStopSec=15
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
index 4ac192eed1cabfb1c1d9b75a596ce27227bf9f27..cfe565922b367fb66ec0e8b3039b9949f6d71e4c 100644 (file)
@@ -15,5 +15,6 @@ ceph_restapi_docker_interface: eth0
 ceph_restapi_port: 5000
 ceph_restapi_docker_username: ceph
 ceph_restapi_docker_imagename: daemon
+ceph_restapi_docker_image_tag: latest
 ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
 ceph_docker_on_openstack: false
index dda476fc350bd022f8ad926b416b6277548ab0e3..9d4f7da2415446d4a1cd6a3e940614a606997d1a 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: inspect ceph version
-  shell: docker inspect docker.io/"{{ ceph_restapi_docker_username }}"/"{{ ceph_restapi_docker_imagename }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index a46bcd5bcfea3e6c0137ec3897ed0c6dbb6e29bd..a0945cc1f75e7a342a80675fde6e540a52bfd76f 100644 (file)
@@ -2,8 +2,9 @@
 - include: pre_requisite.yml
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_restapi_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_restapi_docker_imagename}}'
+    ceph_docker_username: "{{ ceph_restapi_docker_username }}"
+    ceph_docker_imagename: "{{ ceph_restapi_docker_imagename }}"
+    ceph_docker_image_tag: "{{ ceph_restapi_docker_image_tag }}"
 - include: dirs_permissions.yml
 - include: fetch_configs.yml
 - include: start_docker_restapi.yml
index fdde266fa0df4c7a450977e1d432225c3d1caf57..40e6b355b7f532d0a554336376d74ca6c2ee6760 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - name: run the ceph rest api docker image
   docker:
-    image: "{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}"
+    image: "{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}"
     name: "{{ ansible_hostname }}-ceph-restapi"
     net: host
     expose: "{{ ceph_restapi_port }}"
index 0573ec8fc3b362e5adaf49d4d2f72aef46390d75..3b9282e36858c938630c172f40ca6387bbc2bc04 100644 (file)
@@ -33,5 +33,6 @@ kv_endpoint: 127.0.0.1
 ceph_rgw_civetweb_port: 80
 ceph_rgw_docker_username: ceph
 ceph_rgw_docker_imagename: daemon
+ceph_rgw_docker_image_tag: latest
 ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
 ceph_docker_on_openstack: false
index 52d2adde837d82032f438dad1e4567132c07dbb1..ccdf915fbb0a197b2adf716b91c151fbcfad944a 100644 (file)
@@ -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 }}" | awk -F '=' '/CEPH_VERSION/ { gsub ("\",", "", $2); print $2 }' | uniq
+  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
   changed_when: false
   failed_when: false
   run_once: true
index 65fa60263d46a0c8029d8f2fb3e7329c37bde5ba..d94ac396479b6a214ba71809a77aec90386727dc 100644 (file)
@@ -19,8 +19,9 @@
 - include: pre_requisite.yml
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
   vars:
-    ceph_docker_username: '{{ ceph_rgw_docker_username}}'
-    ceph_docker_imagename: '{{ ceph_rgw_docker_imagename}}'
+    ceph_docker_username: "{{ ceph_rgw_docker_username }}"
+    ceph_docker_imagename: "{{ ceph_rgw_docker_imagename }}"
+    ceph_docker_image_tag: "{{ ceph_rgw_docker_image_tag }}"
 - include: dirs_permissions.yml
 # NOTE (jimcurtis): dirs_permissions.yml must precede fetch_configs.yml
 # because it creates the directories needed by the latter.
index 4527702671992d25c48f01e04931be84b13aa0f4..11e9f910e8b6ea3b3fd4c00529c2d60c86f455bd 100644 (file)
@@ -39,7 +39,7 @@
 
 - name: run the rados gateway docker image
   docker:
-    image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}"
+    image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
     name: ceph-{{ ansible_hostname }}-rgw
     expose: "{{ ceph_rgw_civetweb_port }}"
     ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
index e7115e4b933d8563b0e1cad6ee167ca3ce42812d..5a173f95b9cce9f7f47d16fff0c2f6efe74953bc 100644 (file)
@@ -17,7 +17,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    --privileged \
    -e CEPH_DAEMON=RGW \
    --name={{ ansible_hostname }} \
-   {{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}
+   {{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s