From 655b8449aea06aeead3e574a561c0c1c1522e9c1 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 16 Jan 2017 11:17:41 -0600 Subject: [PATCH] use ceph_docker_registry when starting containers Signed-off-by: Andrew Schoen --- roles/ceph-mds/templates/ceph-mds.service.j2 | 2 +- roles/ceph-mon/templates/ceph-mon.service.j2 | 2 +- roles/ceph-nfs/templates/ceph-nfs.service.j2 | 2 +- roles/ceph-osd/templates/ceph-osd.service.j2 | 2 +- roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2 | 2 +- roles/ceph-restapi/tasks/docker/start_docker_restapi.yml | 2 +- roles/ceph-rgw/templates/ceph-rgw.service.j2 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/ceph-mds/templates/ceph-mds.service.j2 b/roles/ceph-mds/templates/ceph-mds.service.j2 index 311c3b7f8..8c89c6a16 100644 --- 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 32724f2e3..a9f41a923 100644 --- 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 1be0320ae..5a12c4316 100644 --- 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 b9dcbb0ea..870e64888 100644 --- 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 594e26e1c..5c2809f77 100644 --- 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 045c07d1d..9678142bc 100644 --- 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 e29a9d854..1cb477986 100644 --- 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