aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-06 15:39:50 +0000
committerGerrit Code Review <review@openstack.org>2017-09-06 15:39:50 +0000
commit744b15e141b487a9f560e80f85cb092396393f8b (patch)
tree2c4c5d57a45782dbfbfc73b849bbb780a61eaff5 /docker
parent21be02962dbb03c4df9818f6b4be8f697cc98094 (diff)
parentc03ed4d38d67ba552b885ff664c4ebfbdec0c14a (diff)
Merge "Unset default value for the DockerCephDaemonImage" into stable/pike
Diffstat (limited to 'docker')
-rw-r--r--docker/services/ceph-ansible/ceph-base.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index 2f2af2d..2a59286 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: