openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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
This commit is contained in:
Giulio Fidente 2017-08-31 13:02:14 +02:00
parent eaf60f1c2b
commit fcc3259891
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario001-multinode-containers.yaml
View File

@ -125,6 +125,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

1
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -118,7 +118,6 @@ parameters:
DockerCephDaemonImage:
description: image
type: string
default: 'ceph/daemon:tag-build-master-jewel-centos-7'
conditions:
custom_registry_host: