From be2080689ea09b325804d7cd5f9d96508cc83ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Wed, 6 Dec 2017 16:30:35 +0100 Subject: [PATCH] Comment out tacker image until service is ready The kolla tacker image was split into base, conductor and server images in review I52778e86e4f2c297ead8d4b09983e5e38ca88c70 but TripleO implementation is lacking behind and is still referencing the tacker image. This prevents to automatically generate the list of images required for a TripleO deployment by inspecting the overcloud_containers.yaml.j2 file. This commit comments out the tacker block until the TripleO tacker service implementation has caught up with the Kolla change. Change-Id: I4883ab04cec428a619ace84d61d4d44bd302264e Related-Bug: #1714270 --- container-images/overcloud_containers.yaml | 1 - container-images/overcloud_containers.yaml.j2 | 16 ++++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index f603414e8..ddc7c3114 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -91,7 +91,6 @@ container_images: - imagename: docker.io/tripleoupstream/centos-binary-swift-container:latest - imagename: docker.io/tripleoupstream/centos-binary-swift-object:latest - imagename: docker.io/tripleoupstream/centos-binary-swift-proxy-server:latest -- imagename: docker.io/tripleoupstream/centos-binary-tacker:latest - imagename: docker.io/tripleoupstream/centos-binary-zaqar:latest - imagename: docker.io/ceph/daemon:tag-stable-3.0-luminous-centos-7 - imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index 8f9d79f90..fbfd16c0f 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -665,12 +665,16 @@ container_images_template: - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftStorage -- imagename: "{{namespace}}/{{name_prefix}}tacker{{name_suffix}}:{{tag}}" - params: - - DockerTackerConfigImage - - DockerTackerImage - services: - - OS::TripleO::Services::Tacker +# The kolla tacker image was split into base, conductor and server images in +# kolla review https://review.openstack.org/#/c/477494/ +# Uncomment when TripleO has caught up with the change. +# https://bugs.launchpad.net/tripleo/+bug/1714270 +# - imagename: "{{namespace}}/{{name_prefix}}tacker{{name_suffix}}:{{tag}}" +# params: +# - DockerTackerConfigImage +# - DockerTackerImage +# services: +# - OS::TripleO::Services::Tacker - imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}" params: