From 2f0f3390f85807e32445e7c044487c7d6d7256fe Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 2 Nov 2018 11:39:28 +0000 Subject: [PATCH] Revert "Add crane service to overcloud_containers.yaml.j2" mod_xsendfile comes from EPEL, so we'll also have to import it. Until we import the RPM into RDO, we revert this patch so we can unblock the promotion pipeline. This reverts commit 9f0862679e78d5880ea0f0e1241843bebb53dcd1. Change-Id: I1672feea517de0b7bf08465b586eaa9ccc98e873 Related-Bug: #1801076 --- container-images/overcloud_containers.yaml | 1 - container-images/overcloud_containers.yaml.j2 | 7 ------- 2 files changed, 8 deletions(-) diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 5b89b42fc..024736c9e 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -16,7 +16,6 @@ container_images: - imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-congress-api:current-tripleo -- imagename: docker.io/tripleomaster/centos-binary-crane:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo - imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index 1dec7c91f..2d3ee49e5 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -140,13 +140,6 @@ container_images_template: services: - OS::TripleO::Services::Congress -- imagename: "{{namespace}}/{{name_prefix}}crane{{name_suffix}}:{{tag}}" - params: - - DockerCraneConfigImage - - DockerCraneImage - services: - - OS::TripleO::Services::Crane - - imagename: "{{namespace}}/{{name_prefix}}cron{{name_suffix}}:{{tag}}" params: - DockerCrondConfigImage