]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-osd: use ceph_docker_registry when preparing OSDs 1229/head
authorAndrew Schoen <aschoen@redhat.com>
Mon, 16 Jan 2017 17:39:13 +0000 (11:39 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Mon, 16 Jan 2017 17:39:13 +0000 (11:39 -0600)
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
roles/ceph-osd/tasks/docker/start_docker_osd.yml

index ad6cc5d74775612a1697ffeaea25251c7786983d..5c830804f5de0443abded80f757ec32ddf995c67 100644 (file)
@@ -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 }}"