use ceph_docker_registry when starting containers

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2
index 311c3b7f847a781f8d5529bcae6e369181897858..8c89c6a16d10ff56f14e6125d0ae4a99f38a3b78 100644 (file)
--- a/roles/ceph-mds/templates/ceph-mds.service.j2
+++ b/roles/ceph-mds/templates/ceph-mds.service.j2
@@ -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_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}:{{ ceph_mds_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s

diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2
index 32724f2e3d981703541a9cc984b8a6570c559b25..a9f41a92319a04ff5dd041ee27c731a6932e71f7 100644 (file)
--- a/roles/ceph-mon/templates/ceph-mon.service.j2
+++ b/roles/ceph-mon/templates/ceph-mon.service.j2
@@ -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_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}
+   {{ceph_docker_registry }}/{{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}:{{ ceph_mon_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s

diff --git a/roles/ceph-nfs/templates/ceph-nfs.service.j2 b/roles/ceph-nfs/templates/ceph-nfs.service.j2
index 1be0320ae00de1ab11f0b7c1bba07cd880204680..5a12c43167875a7331456fc51da4eb6eadb272d9 100644 (file)
--- a/roles/ceph-nfs/templates/ceph-nfs.service.j2
+++ b/roles/ceph-nfs/templates/ceph-nfs.service.j2
@@ -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_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_nfs_docker_username }}/{{ ceph_nfs_docker_imagename }}:{{ ceph_nfs_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop %i
 Restart=always
 RestartSec=10s

diff --git a/roles/ceph-osd/templates/ceph-osd.service.j2 b/roles/ceph-osd/templates/ceph-osd.service.j2
index b9dcbb0eab59a1eeb783e7b4a5feab026bc6f66a..870e6488845a72ccb28602b8ce9873943073936f 100644 (file)
--- a/roles/ceph-osd/templates/ceph-osd.service.j2
+++ b/roles/ceph-osd/templates/ceph-osd.service.j2
@@ -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_osd_docker_username }}/{{ ceph_osd_docker_imagename }}:{{ ceph_osd_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ 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

diff --git a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
index 594e26e1cf7431ef9c1fc078b60ba4febf31c592..5c2809f77cebefe3419d6d241c33c2a8eb3e09d1 100644 (file)
--- a/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
+++ b/roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
@@ -17,7 +17,7 @@ ExecStart=/usr/bin/docker run --rm --net=host \
    --privileged \
    -e CEPH_DAEMON=RBD_MIRROR \
    --name={{ ansible_hostname }} \
-   {{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_rbd_mirror_docker_username }}/{{ ceph_rbd_mirror_docker_imagename }}:{{ ceph_rbd_mirror_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s

diff --git a/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml b/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
index 045c07d1da8b31f2919825acc1b36719cda3cbef..9678142bc7d41b83b92aa60b11c47e80b42283fd 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
+++ b/roles/ceph-restapi/tasks/docker/start_docker_restapi.yml
@@ -1,7 +1,7 @@
 ---
 - name: run the ceph rest api docker image
   docker:
-    image: "{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}"
+    image: "{{ ceph_docker_registry }}/{{ ceph_restapi_docker_username }}/{{ ceph_restapi_docker_imagename }}:{{ ceph_restapi_docker_image_tag }}"
     name: "{{ ansible_hostname }}-ceph-restapi"
     net: host
     expose: "{{ ceph_restapi_port }}"

diff --git a/roles/ceph-rgw/templates/ceph-rgw.service.j2 b/roles/ceph-rgw/templates/ceph-rgw.service.j2
index e29a9d854809ded7d0fdab41d9366551d3648257..1cb4779865717a36e47e1e58c3571e3d4c530fc1 100644 (file)
--- a/roles/ceph-rgw/templates/ceph-rgw.service.j2
+++ b/roles/ceph-rgw/templates/ceph-rgw.service.j2
@@ -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_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}
+   {{ ceph_docker_registry }}/{{ ceph_rgw_docker_username }}/{{ ceph_rgw_docker_imagename }}:{{ ceph_rgw_docker_image_tag }}
 ExecStopPost=-/usr/bin/docker stop {{ ansible_hostname }}
 Restart=always
 RestartSec=10s