From: Giulio Fidente <gfidente@redhat.com>
Date: Thu, 31 Aug 2017 11:02:14 +0000 (+0200)
Subject: Unset default value for the DockerCephDaemonImage
X-Git-Tag: opnfv-6.0.0~140^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c03ed4d38d67ba552b885ff664c4ebfbdec0c14a;p=apex-tripleo-heat-templates.git

Unset default value for the DockerCephDaemonImage

We do not want a default value for the container image name parameters
and expect deployers to set this value instead.

Change-Id: I9377b7c3564360353aa6da2d2457b2cfacd4e9d6
Closes-Bug: #1714221
(cherry picked from commit fcc3259891ee67956d63c37217acdb999bc4bb65)
---

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 5014a79b..79d5a280 100644
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -123,6 +123,7 @@ parameter_defaults:
   CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
   CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
   CephPoolDefaultSize: 1
+  DockerCephDaemonImage: ceph/daemon:tag-build-master-jewel-centos-7
   NovaEnableRbdBackend: true
   CinderEnableRbdBackend: true
   CinderBackupBackend: ceph
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index bf2c86c4..3eba2091 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -118,7 +118,6 @@ parameters:
   DockerCephDaemonImage:
     description: image
     type: string
-    default: 'ceph/daemon:tag-build-master-jewel-centos-7'
 
 conditions:
   custom_registry_host: