diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-06 15:39:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-06 15:39:50 +0000 |
| commit | 744b15e141b487a9f560e80f85cb092396393f8b (patch) | |
| tree | 2c4c5d57a45782dbfbfc73b849bbb780a61eaff5 | |
| parent | 21be02962dbb03c4df9818f6b4be8f697cc98094 (diff) | |
| parent | c03ed4d38d67ba552b885ff664c4ebfbdec0c14a (diff) | |
Merge "Unset default value for the DockerCephDaemonImage" into stable/pike
| -rw-r--r-- | ci/environments/scenario001-multinode-containers.yaml | 1 | ||||
| -rw-r--r-- | docker/services/ceph-ansible/ceph-base.yaml | 1 |
2 files changed, 1 insertions, 1 deletions
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 2f2af2d6..2a592869 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: |