From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 31 Jan 2019 19:38:53 +0000 (-0600)
Subject: ceph-config: do not always assume containers when calculating num_osds
X-Git-Tag: v4.0.0beta1~18
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70a4368bc5a58f198b23751f8478f2d79bc5e9f4;p=ceph-ansible.git

ceph-config: do not always assume containers when calculating num_osds

CEPH_CONTAINER_IMAGE should be None if containerized_deployment
is False.

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

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index b1b82508a..495a083b2 100644
--- a/roles/ceph-config/tasks/main.yml
+++ b/roles/ceph-config/tasks/main.yml
@@ -27,7 +27,7 @@
     register: lvm_batch_report
     environment:
       CEPH_VOLUME_DEBUG: 1
-      CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
+      CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
       CEPH_CONTAINER_BINARY: "{{ container_binary }}"
     when:
       - devices | default([]) | length > 0
@@ -47,7 +47,7 @@
     register: lvm_list
     environment:
       CEPH_VOLUME_DEBUG: 1
-      CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}"
+      CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
       CEPH_CONTAINER_BINARY: "{{ container_binary }}"
     when:
       - devices | default([]) | length > 0