]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
docker: use a better method to pull images 1302/head
authorSébastien Han <seb@redhat.com>
Thu, 9 Feb 2017 14:16:39 +0000 (15:16 +0100)
committerSébastien Han <seb@redhat.com>
Thu, 9 Feb 2017 16:57:18 +0000 (17:57 +0100)
We changed the way we declare image.
Prior to this patch we must have a "user/image:tag"
format, which is incompatible with non docker-hub registry where you
usually don't have a "user". On the docker hub a "user" is also
identified as a namespace, so for Ceph the user was "ceph".

Variables have been simplified with only:

* ceph_docker_image
* ceph_docker_image_tag

1. For docker hub images: ceph_docker_name: "ceph/daemon" will give
you the 'daemon' image of the 'ceph' user.

2. For non docker hub images: ceph_docker_name: "daemon" will simply
give you the "daemon" image.

Infrastructure playbooks have been modified as well.
The file group_vars/all.docker.yml.sample has been removed as well.
It is hard to maintain since we have to generate it manually. If
you want to configure specific variables for a specific daemon simply
edit group_vars/$DAEMON.yml

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1420207
Signed-off-by: Sébastien Han <seb@redhat.com>
39 files changed:
group_vars/all.docker.yml.sample [deleted file]
group_vars/all.yml.sample
group_vars/mdss.yml.sample
group_vars/mons.yml.sample
group_vars/nfss.yml.sample
group_vars/osds.yml.sample
group_vars/rbd-mirrors.yml.sample
group_vars/restapis.yml.sample
group_vars/rgws.yml.sample
infrastructure-playbooks/purge-docker-cluster.yml
infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
roles/ceph-common/defaults/main.yml
roles/ceph-common/tasks/docker/fetch_image.yml
roles/ceph-mds/defaults/main.yml
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/templates/ceph-mds.service.j2
roles/ceph-mon/defaults/main.yml
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/pre_requisite.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/create_configs.yml
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/templates/ceph-nfs.service.j2
roles/ceph-osd/defaults/main.yml
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/pre_requisite.yml
roles/ceph-osd/tasks/docker/start_docker_osd.yml
roles/ceph-osd/templates/ceph-osd.service.j2
roles/ceph-rbd-mirror/defaults/main.yml
roles/ceph-rbd-mirror/tasks/docker/main.yml
roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
roles/ceph-restapi/defaults/main.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/main.yml
roles/ceph-rgw/templates/ceph-rgw.service.j2

diff --git a/group_vars/all.docker.yml.sample b/group_vars/all.docker.yml.sample
deleted file mode 100644 (file)
index 9752f04..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
----
-dummy:
-
-##########
-# GLOBAL #
-##########
-#docker: true
-#ceph_docker_dev_image: false
-#ceph_docker_registry: docker.io
-
-#######
-# MON #
-#######
-#mon_containerized_deployment: true
-#mon_containerized_deployment_with_kv: false
-#mon_containerized_default_ceph_conf_with_kv: true
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#kv_port: 4001
-#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_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }}
-
-#######
-# OSD #
-#######
-#osd_containerized_deployment: true
-#osd_containerized_deployment_with_kv: false
-#kv_type: etcd
-#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: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }}
-#ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1" # comma separated variables
-#ceph_osd_docker_devices:
-# - /dev/sdb
-# - /dev/sdc
-#journal_size: 5120 # OSD journal size in MB
-#public_network: 0.0.0.0/0
-#cluster_network: "{{ public_network }}"
-
-#######
-# MDS #
-#######
-#mds_containerized_deployment: true
-#mds_containerized_deployment_with_kv: false
-#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: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }}
-
-#######
-# RGW #
-#######
-#rgw_containerized_deployment: true
-#rgw_containerized_deployment_with_kv: false
-#kv_type: etcd
-#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: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}
-
-###########
-# RESTAPI #
-###########
-#restapi_containerized_deployment: true
-#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
-
-
-##############
-# RBD MIRROR #
-##############
-#rbd_mirror_containerized_deployment: true
-#rbd_mirror_containerized_deployment_with_kv: false
-#kv_type: etcd
-#kv_endpoint: 127.0.0.1
-#ceph_rbd_mirror_docker_username: ceph
-#ceph_rbd_mirror_docker_imagename: daemon
-#ceph_rbd_mirror_docker_image_tag: latest
-#ceph_docker_on_openstack: false
-
-#######
-# NFS #
-#######
-#nfs_containerized_deployment: true
-#nfs_containerized_deployment_with_kv: false
-#ceph_nfs_docker_username: ceph
-#ceph_nfs_docker_imagename: daemon
-#ceph_nfs_docker_image_tag: latest
-#ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
-#nfs_file_gw: false
-#nfs_obj_gw: false
-#ceph_nfs_rgw_access_key: "QFAMEDSJP5DEKJO0DDXY"
-#ceph_nfs_rgw_secret_key: "iaSFLDVvDdQt6lkNzHyW4fPLZugBAI1g17LO0+87[MAC[M#C"
index 375583adbbde56f34bfabdd1610cbcb6acdb4888..2cf51f8bb00ef75e843a77f493caf78d7f2f9688 100644 (file)
@@ -393,6 +393,8 @@ dummy:
 ##########
 
 #docker: false
+#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 
 # Do not comment the following variables mon_containerized_deployment_* here. These variables are being used
 # by ceph.conf.j2 template. so it should always be defined
index 6bf33c6822744cef2a404af6a1d50be3fe9c46bd..d49dfd2569210bd8383b38ec21160fdcf7b11916 100644 (file)
@@ -32,9 +32,8 @@ dummy:
 #mds_containerized_deployment_with_kv: false
 #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_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_mds_docker_extra_env: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }}
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
index 6470030f5b641ac74d0a2bd74ad2c97cbea2735b..16bd4074661fc1d3727fc0c7097921c090856157 100644 (file)
@@ -81,9 +81,8 @@ dummy:
 #mon_containerized_default_ceph_conf_with_kv: false
 #ceph_mon_docker_interface: "{{ monitor_interface }}"
 #ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
-#ceph_mon_docker_username: ceph
-#ceph_mon_docker_imagename: daemon
-#ceph_mon_docker_image_tag: latest
+#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }}
 #ceph_docker_on_openstack: false
 #mon_docker_privileged: false
index f1ef364d8bab2eee688223b7eb75e3ecc7b328e4..4433f6f9f96ed8b53e59e30ad6229b755e544d05 100644 (file)
@@ -85,9 +85,8 @@ dummy:
 #nfs_containerized_deployment_with_kv: false
 #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_docker_image: "ceph/ganesha"
+#ceph_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
index de472aa721e884ebec6da55a977668a9d7318a7b..7ee4363f985c2e1bd09f647ddce7bb041bc0ea51 100644 (file)
@@ -177,9 +177,8 @@ dummy:
 #kv_endpoint: 127.0.0.1
 #kv_port: 4001
 #ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
-#ceph_osd_docker_username: ceph
-#ceph_osd_docker_imagename: daemon
-#ceph_osd_docker_image_tag: latest
+#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }}
 #ceph_osd_docker_devices: "{{ devices }}"
 #ceph_docker_on_openstack: false
index 15ab9cd021a161419b3fdd14664471da5f5e2843..22d1933d7e105a9170667bd706293a9698e0e0b4 100644 (file)
@@ -46,9 +46,8 @@ dummy:
 #rbd_mirror_containerized_deployment_with_kv: false
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
-#ceph_rbd_mirror_docker_username: ceph
-#ceph_rbd_mirror_docker_imagename: daemon
-#ceph_rbd_mirror_docker_image_tag: latest
+#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
 
index a4e01e75399214b8e668fe6354b40ebaa3661699..425e56a1fa152cab0924b4953a215b72a097c4f4 100644 (file)
@@ -21,9 +21,8 @@ dummy:
 #restapi_containerized_deployment: false
 #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_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
index d5b7acfcd6ac6e1fb5eb07f8fe5987fbfa5862f5..61152debc7a728c95cbd5bcf7649a5c4d66f66cf 100644 (file)
@@ -43,9 +43,8 @@ dummy:
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
 #ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
-#ceph_rgw_docker_username: ceph
-#ceph_rgw_docker_imagename: daemon
-#ceph_rgw_docker_image_tag: latest
+#ceph_docker_image: "ceph/daemon"
+#ceph_docker_image_tag: latest
 #ceph_rgw_docker_extra_env: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}
 #ceph_docker_on_openstack: false
 #ceph_config_keys: [] # DON'T TOUCH ME
index 5c7dd4fca5d8f687e79c05e2fa9a75f49336bf65..ec53beeff71751151e169fb3a153d4d6e2a8c53c 100644 (file)
@@ -71,7 +71,7 @@
 
   - name: remove ceph mds container
     docker:
-      image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       state: absent
     ignore_errors: true
@@ -84,8 +84,8 @@
   - name: remove ceph mds image
     docker_image:
       state: absent
-      name: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}"
-      tag: "{{ ceph_mds_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
 
   - name: remove ceph rgw container
     docker:
-      image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       state: absent
     ignore_errors: true
   - name: remove ceph rgw image
     docker_image:
       state: absent
-      name: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}"
-      tag: "{{ ceph_rgw_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
 
   - name: remove ceph rbd-mirror container
     docker:
-      image: "{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       state: absent
     ignore_errors: true
   - name: remove ceph rbd-mirror image
     docker_image:
       state: absent
-      name: "{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}"
-      tag: "{{ ceph_rbd_mirror_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
 
   - name: remove ceph nfs container
     docker:
-      image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       state: absent
     ignore_errors: true
   - name: remove ceph nfs image
     docker_image:
       state: absent
-      name: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}"
-      tag: "{{ ceph_nfs_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
 
   - name: remove ceph osd prepare container
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-prepare-{{ item | regex_replace('/', '') }}"
       state: absent
     with_items: "{{ ceph_osd_docker_devices }}"
 
   - name: remove ceph osd container
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-{{ item | regex_replace('/', '') }}"
       state: absent
     with_items: "{{ ceph_osd_docker_devices }}"
 
   - name: zap ceph osd disk
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
       net: host
       pid: host
 
   - name: remove ceph osd zap disk container
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
       state: absent
     with_items: "{{ ceph_osd_docker_devices }}"
   # zap twice
   - name: zap ceph osd disk
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
       net: host
       pid: host
 
   - name: remove ceph osd zap disk container
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-zap-{{ item | regex_replace('/', '') }}"
       state: absent
     with_items: "{{ ceph_osd_docker_devices }}"
   - name: remove ceph osd image
     docker_image:
       state: absent
-      name: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
-      tag: "{{ ceph_osd_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
 
   - name: remove ceph mon container
     docker:
-      image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       state: absent
     ignore_errors: true
 
   - name: remove restapi container
     docker:
-      image: "{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-ceph-restapi"
       state: absent
     ignore_errors: true
   - name: remove ceph mon image
     docker_image:
       state: absent
-      name: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
-      tag: "{{ ceph_mon_docker_image_tag }}"
+      name: "{{ ceph_docker_image }}"
+      tag: "{{ ceph_docker_image_tag }}"
       force: yes
     tags:
       remove_img
index b09ddba6ca209dab2e4e9e645b02295993d8ee7e..26edb88662222a27bf6d8494820bd51399b7a050 100644 (file)
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_mon_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_mon_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_mon_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_mon_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph mon container image
     docker:
-      image: "{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       net: "host"
       state: "running"
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_osd_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_osd_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_osd_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_osd_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph osd container image(s)
     docker:
-      image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}-osd-{{ item | regex_replace('/', '') }}"
       net: host
       pid: host
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_mds_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_mds_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_mds_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_mds_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph metadata container image
     docker:
-      image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: ceph-{{ ansible_hostname }}-mds
       net: host
       state: running
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_rgw_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_rgw_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_rgw_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_rgw_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph rados gateway container image
     docker:
-      image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: ceph-{{ ansible_hostname }}-rgw
       expose: "{{ ceph_rgw_civetweb_port }}"
       ports: "{{ ceph_rgw_civetweb_port }}:{{ ceph_rgw_civetweb_port }}"
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_rbd_mirror_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_rbd_mirror_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_rbd_mirror_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_rbd_mirror_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph rbd mirror container image
     docker:
-      image: "{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       net: host
       state: running
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_nfs_docker_image_tag | match("latest")
+    when: ceph_docker_image_tag | match("latest")
 
   - set_fact:
       ceph_uid: 64045
-    when: ceph_nfs_docker_image_tag | search("ubuntu")
+    when: ceph_docker_image_tag | search("ubuntu")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_nfs_docker_image_tag | search("centos")
+    when: ceph_docker_image_tag | search("centos")
 
   - set_fact:
       ceph_uid: 167
-    when: ceph_nfs_docker_image_tag | search("fedora")
+    when: ceph_docker_image_tag | search("fedora")
 
   - name: set proper ownership on ceph directories
     file:
 
   - name: start ceph nfs container image
     docker:
-      image: "{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}"
+      image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
       name: "{{ ansible_hostname }}"
       net: "host"
       state: "running"
index e6dddb528260bde114f5e32e8977bc6a13dbca7a..c5a5643261b44504ed568a1e72595de297e0a017 100644 (file)
@@ -385,6 +385,8 @@ os_tuning_params:
 ##########
 
 docker: false
+ceph_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 
 # Do not comment the following variables mon_containerized_deployment_* here. These variables are being used
 # by ceph.conf.j2 template. so it should always be defined
index 26e8b2b01fb5bbb7a16910376c76088fbf488c23..57c76ed859e9cbcf30e916107c9b0e40ac48efb8 100644 (file)
@@ -1,7 +1,7 @@
 ---
 # Normal case - pull image from registry
-- name: pull ceph daemon image
-  command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_username }}/{{ ceph_docker_imagename }}:{{ ceph_docker_image_tag }}"
+- name: "pull {{ ceph_docker_image }} image"
+  command: "docker pull {{ ceph_docker_registry}}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
   changed_when: false
   when: ceph_docker_dev_image is undefined or not ceph_docker_dev_image
 
index d54171c874656ae046fc7b8feb4a05b68fb75fed..71574897e6d7d26c0f4fa61daeca35b399dafc91 100644 (file)
@@ -24,9 +24,8 @@ mds_containerized_deployment: false
 mds_containerized_deployment_with_kv: false
 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_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_mds_docker_extra_env: -e CLUSTER={{ cluster }} -e MDS_NAME={{ ansible_hostname }}
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index 05995b7a63a7bed8534e0a9969791032914331ef..507aadfa8c18d99cb9bec29b4e54999590e38a2f 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_mds_docker_username}}/{{ceph_mds_docker_imagename}}:{{ceph_mds_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - 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_image_tag: "{{ ceph_mds_docker_image_tag }}"
 - include: dirs_permissions.yml
 - include: fetch_configs.yml
 
index 8c89c6a16d10ff56f14e6125d0ae4a99f38a3b78..15a35aad4dd6d1ab7627d449f4d9ac8eb1a07019 100644 (file)
@@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    -e CEPHFS_CREATE=1 \
    {{ ceph_mds_docker_extra_env }} \
    --name={{ ansible_hostname }} \
-   {{ ceph_docker_registry }}/{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s
index cbe61432b3fa493e3bfa80100d44f60af82011ae..a9a837ec0faebd2f9860b3b2f83a5ceffd7b379d 100644 (file)
@@ -73,9 +73,8 @@ mon_containerized_deployment_with_kv: false
 #mon_containerized_default_ceph_conf_with_kv: false
 ceph_mon_docker_interface: "{{ monitor_interface }}"
 ceph_mon_docker_subnet: "{{ public_network }}"# subnet of the ceph_mon_docker_interface
-ceph_mon_docker_username: ceph
-ceph_mon_docker_imagename: daemon
-ceph_mon_docker_image_tag: latest
+ceph_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_mon_docker_extra_env: -e CLUSTER={{ cluster }} -e FSID={{ fsid }} -e MON_NAME={{ ansible_hostname }}
 ceph_docker_on_openstack: false
 mon_docker_privileged: false
index 15499e6e201c381f33c43b225a6d650222686489..f1bc6dc11cea8b376849990bd9bee35c316dc5df 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}}:{{ceph_mon_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - 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_image_tag: "{{ ceph_mon_docker_image_tag }}"
 
 - include: dirs_permissions.yml
 
index d41fe789279e3e19ab6e6b252aa1b599f990d599..5a8135ed59d889ccf674646796208535275876b5 100644 (file)
   tags:
     with_pkg
   when: ansible_version['full'] | version_compare('2.1.0.0', '<')
+
 - name: install docker-py
   pip:
     name: docker-py
index 50dc8f37d6e6c112ff74c16010c73a7b0abae562..6339a1b6a612d3390667b24fccb0c669e6792f88 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_image_tag }}"
+    image: "{{ ceph_docker_image }}:{{ ceph_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_image_tag }}"
+    image: "{{ ceph_docker_image }}:{{ ceph_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_image_tag }}"
+    image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
   when: mon_containerized_deployment_with_kv
 
 - name: generate systemd unit file
index 1815015c5bf675373cb38324019b85e695058b40..373d46e76b29c0a02e06f6dc700c5971c543aa14 100644 (file)
@@ -26,7 +26,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 }} \
    {{ ceph_mon_docker_extra_env }} \
-   {{ceph_docker_registry }}/{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}
+   {{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s
index 23b694170e7bdea789cff7fcb910a8715f762aef..509d38bc1c739675d2618b27be626a0e1f9e7eeb 100644 (file)
@@ -77,9 +77,8 @@ nfs_containerized_deployment: false
 nfs_containerized_deployment_with_kv: false
 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_docker_image: "ceph/ganesha"
+ceph_docker_image_tag: latest
 #ceph_nfs_docker_extra_env: -e GANESHA_EPOCH={{ ganesha_epoch }}
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index edb3dcdbbb63df1b13022e3ee7ea313c55a63492..28962251b8b272aeac1ac285f22b594d01bc94a0 100644 (file)
@@ -9,7 +9,7 @@
 
 - name: create the nfs rgw user
   docker:
-    image: "{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}"
+    image: "{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
     name: ceph-{{ ansible_hostname }}-rgw-user
     hostname: "{{ ansible_hostname }}"
     expose: "{{ ceph_rgw_civetweb_port }}"
index a54fb12b1331ca4b1099118ecf29885161acba0b..d80a4c97509b0104d700fea08516cc507b4f3bf2 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}}:{{ceph_nfs_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - 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_image_tag: "{{ ceph_nfs_docker_image_tag }}"
 
 - include: dirs_permissions.yml
 
index 5a12c43167875a7331456fc51da4eb6eadb272d9..43cf0a5dd9bd054989c1937ff642b2ebefc30b04 100644 (file)
@@ -20,7 +20,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    -e CEPH_DAEMON=NFS \
    {{ ceph_nfs_docker_extra_env }} \
    --name=nfs-{{ ansible_hostname }} \
-   {{ ceph_docker_registry }}/{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s
index fded10d75a831dda75ff38103ecb53ec8db48852..b0e00ce0fe1a47420acbdc8b4689290fecbb725a 100644 (file)
@@ -169,9 +169,8 @@ kv_type: etcd
 kv_endpoint: 127.0.0.1
 kv_port: 4001
 ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
-ceph_osd_docker_username: ceph
-ceph_osd_docker_imagename: daemon
-ceph_osd_docker_image_tag: latest
+ceph_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }}
 ceph_osd_docker_devices: "{{ devices }}"
 ceph_docker_on_openstack: false
index 3d778eb2d8fdbb5bc2c42b3963abddf56c7c771f..9771bcd14926b3ac66148ae0cdc8554c98f4a2e5 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_osd_docker_username}}/{{ceph_osd_docker_imagename}}:{{ceph_osd_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - 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_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 83dc90b886bf0db638845ad2c6dcf1fdff801724..85a1047f0f351d355445c5505e27220a10965d08 100644 (file)
   tags:
     with_pkg
   when: ansible_version['full'] | version_compare('2.1.0.0', '<')
+
 - name: install docker-py
   pip:
     name: docker-py
index 196725b3179a209887e14ea9dd93932fb5c6451f..e1ea76a84ccb67af94e9e9669110f686609f19be 100644 (file)
@@ -33,7 +33,7 @@
     -e "OSD_DEVICE={{ item.0 }}" \
     -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
     {{ ceph_osd_docker_prepare_env }} \
-    "{{ ceph_docker_registry }}/{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}"
+    "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
   with_together:
     - "{{ ceph_osd_docker_devices }}"
     - "{{ osd_prepared.results }}"
@@ -58,7 +58,7 @@
     -e KV_IP={{kv_endpoint}} \
     -e KV_PORT={{kv_port}} \
     {{ ceph_osd_docker_prepare_env }} \
-    "{{ ceph_docker_registry }}/{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}" \
+    "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}" \
   with_together:
     - "{{ ceph_osd_docker_devices }}"
     - "{{ osd_prepared.results }}"
index 870e6488845a72ccb28602b8ce9873943073936f..46bee9ff6d1f83b0df8bb964d422bc05f5822e0f 100644 (file)
@@ -22,7 +22,7 @@ ExecStart=/usr/bin/docker run --rm --net=host --pid=host\
    -e OSD_DEVICE=/dev/%i \
    {{ ceph_osd_docker_extra_env }} \
    --name={{ ansible_hostname }}-osd-dev%i \
-   {{ ceph_docker_registry }}/{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStop=-/usr/bin/docker stop {{ ansible_hostname }}-osd-dev%i
 Restart=always
 RestartSec=10s
index 6ecf8acde7073691aa8afd32cf7b17d165e6139e..4395c6e03f010c52430f6b6500fdd2c157702775 100644 (file)
@@ -38,8 +38,7 @@ rbd_mirror_containerized_deployment: false
 rbd_mirror_containerized_deployment_with_kv: false
 kv_type: etcd
 kv_endpoint: 127.0.0.1
-ceph_rbd_mirror_docker_username: ceph
-ceph_rbd_mirror_docker_imagename: daemon
-ceph_rbd_mirror_docker_image_tag: latest
+ceph_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index ea707311885f3bb4951198ff28e19de1ea2f15c1..20da41b5c2b75235f0d28af705763c7a539c50d4 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_rbd_mirror_docker_username}}/{{ceph_rbd_mirror_docker_imagename}}:{{ceph_rbd_mirror_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - include: "{{ playbook_dir }}/roles/ceph-common/tasks/docker/fetch_image.yml"
-  vars:
-    ceph_docker_username: "{{ ceph_rbd_mirror_docker_username }}"
-    ceph_docker_imagename: "{{ ceph_rbd_mirror_docker_imagename }}"
-    ceph_docker_image_tag: "{{ ceph_rbd_mirror_docker_image_tag }}"
 - include: dirs_permissions.yml
 - include: fetch_configs.yml
 
index 5c2809f77cebefe3419d6d241c33c2a8eb3e09d1..d0cb408719e89a1c94da0c8c42103b1ea17f910d 100644 (file)
@@ -17,7 +17,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    --privileged \
    -e CEPH_DAEMON=RBD_MIRROR \
    --name={{ ansible_hostname }} \
-   {{ ceph_docker_registry }}/{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s
index b93605b15bac847f116f4bffb41f328d5ff9f3f8..8df5940709cfe0c2d0786f17b797b82b6c3b3ad7 100644 (file)
@@ -13,9 +13,8 @@ fetch_directory: fetch/
 restapi_containerized_deployment: false
 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_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index e028a5d60ee4f36294bc91147a4ecf0813d27199..22e7a5f638d99c1cd383794ddd816cb75df82fb5 100644 (file)
     - ntp_service_enabled
 
 - 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_image_tag: "{{ ceph_restapi_docker_image_tag }}"
 - include: dirs_permissions.yml
 - include: fetch_configs.yml
 - include: start_docker_restapi.yml
index 9678142bc7d41b83b92aa60b11c47e80b42283fd..d3205ef2252758bf473d03aadf615b7cfcfcd797 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - name: run the ceph rest api docker image
   docker:
-    image: "{{ ceph_docker_registry }}/{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}"
+    image: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
     name: "{{ ansible_hostname }}-ceph-restapi"
     net: host
     expose: "{{ ceph_restapi_port }}"
index 9ae24da3fceee5e0648e28c3ee8dbb35060c7898..fb07dd456ab1ab553899d7d27be4eafbfbc45754 100644 (file)
@@ -35,9 +35,8 @@ rgw_containerized_deployment_with_kv: false
 kv_type: etcd
 kv_endpoint: 127.0.0.1
 ceph_rgw_civetweb_port: "{{ radosgw_civetweb_port }}"
-ceph_rgw_docker_username: ceph
-ceph_rgw_docker_imagename: daemon
-ceph_rgw_docker_image_tag: latest
+ceph_docker_image: "ceph/daemon"
+ceph_docker_image_tag: latest
 ceph_rgw_docker_extra_env: -e CLUSTER={{ cluster }} -e RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}
 ceph_docker_on_openstack: false
 ceph_config_keys: [] # DON'T TOUCH ME
index 6fcb14abb9179ad925023afadc6d46f2a55fd761..f3b9b4ebe9b57160c08d3ddc55ca55528ad46468 100644 (file)
@@ -1,6 +1,6 @@
 ---
 - name: check if a cluster is already running
-  shell: "docker ps | grep -sq '{{ceph_rgw_docker_username}}/{{ceph_rgw_docker_imagename}}:{{ceph_rgw_docker_image_tag}}'"
+  command: "docker ps -q -a --filter='ancestor={{ ceph_docker_image }}:{{ ceph_docker_image_tag }}'"
   register: ceph_health
   changed_when: false
   failed_when: false
     - ntp_service_enabled
 
 - 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_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 1cb4779865717a36e47e1e58c3571e3d4c530fc1..621f65a17596f48e23f045b9fd58510e97aa52da 100644 (file)
@@ -19,7 +19,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    -e CEPH_DAEMON=RGW \
    {{ ceph_rgw_docker_extra_env }} \
    --name={{ ansible_hostname }} \
-   {{ ceph_docker_registry }}/{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s