openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Consume ceph-container project's new style of tags"

Browse Source
This commit is contained in:
Zuul 2018-03-24 01:31:12 +00:00 committed by Gerrit Code Review
commit 87bddc6608
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,8 +111,7 @@ parameter_defaults:
Debug: true Debug: true
DockerPuppetDebug: True DockerPuppetDebug: True
#TODO(gfidente): remove when the new default is in tripleo-common DockerCephDaemonImage: docker.io/ceph/daemon:v3.0.1-stable-3.0-luminous-centos-7-x86_64
DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
CephAnsibleDisksConfig: CephAnsibleDisksConfig:
devices: devices:
- /dev/loop3 - /dev/loop3

3
ci/environments/scenario004-multinode-containers.yaml
View File

@ -92,8 +92,7 @@ parameter_defaults:
nova::compute::libvirt::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu
Debug: true Debug: true
DockerPuppetDebug: True DockerPuppetDebug: True
#TODO(gfidente): remove when the new default is in tripleo-common DockerCephDaemonImage: docker.io/ceph/daemon:v3.0.1-stable-3.0-luminous-centos-7-x86_64
DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
CephAnsibleDisksConfig: CephAnsibleDisksConfig:
devices: devices:
- /dev/loop3 - /dev/loop3