Merge "Consume ceph-container project's new style of tags" into stable/queens
This commit is contained in:
commit
48a4e12565
|
@ -111,8 +111,7 @@ parameter_defaults:
|
|||
|
||||
Debug: true
|
||||
DockerPuppetDebug: True
|
||||
#TODO(gfidente): remove when the new default is in tripleo-common
|
||||
DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
|
||||
DockerCephDaemonImage: docker.io/ceph/daemon:v3.0.1-stable-3.0-luminous-centos-7-x86_64
|
||||
CephAnsibleDisksConfig:
|
||||
devices:
|
||||
- /dev/loop3
|
||||
|
|
|
@ -92,8 +92,7 @@ parameter_defaults:
|
|||
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||
Debug: true
|
||||
DockerPuppetDebug: True
|
||||
#TODO(gfidente): remove when the new default is in tripleo-common
|
||||
DockerCephDaemonImage: docker.io/ceph/daemon:tag-build-master-luminous-centos-7
|
||||
DockerCephDaemonImage: docker.io/ceph/daemon:v3.0.1-stable-3.0-luminous-centos-7-x86_64
|
||||
CephAnsibleDisksConfig:
|
||||
devices:
|
||||
- /dev/loop3
|
||||
|
|
Loading…
Reference in New Issue