From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 16 Jan 2017 17:39:13 +0000 (-0600)
Subject: ceph-osd: use ceph_docker_registry when preparing OSDs
X-Git-Tag: v2.1.4~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f8d18253b574f52ed93f13127900afd8cf9c2e0a;p=ceph-ansible.git

ceph-osd: use ceph_docker_registry when preparing OSDs

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 0c55a35963713927e8614d5546a9e6ae3a2414f1)
---

diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
index ad6cc5d74..5c830804f 100644
--- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml
+++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -33,7 +33,7 @@
     -e "OSD_DEVICE={{ item.0 }}" \
     -e CEPH_DAEMON=OSD_CEPH_DISK_PREPARE \
     {{ ceph_osd_docker_prepare_env }} \
-    "{{ 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 }}"
   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_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 }}" \
   with_together:
     - "{{ ceph_osd_docker_devices }}"
     - "{{ osd_prepared.results }}"