From 5a6074c5181a8c96579095a21f1a033153f51441 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Thu, 15 Mar 2018 10:48:00 -0400 Subject: [PATCH] Consume ceph-container project's new style of tags The ceph-container project is moving to a new style of tags for Ceph. Update scenario001/004 to pull Ceph container images using the new tags. Change-Id: I2a6a7c5fb5148e951f85850c09be7cbb59fce0f8 (cherry picked from commit 09ff488f0df36df321e5d711f8b49c343013f12d) --- ci/environments/scenario001-multinode-containers.yaml | 3 +-- ci/environments/scenario004-multinode-containers.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 11388248c3..bbb765adac 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -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 diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index b94956e700..e143c92c89 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -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