openstack/tripleo-common
Code Issues Proposed changes

Revert "Add crane service to overcloud_containers.yaml.j2"

Browse Source 
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 9f0862679e.

Change-Id: I1672feea517de0b7bf08465b586eaa9ccc98e873
Related-Bug: #1801076
This commit is contained in:
Emilien Macchi
2018-11-02 11:39:28 +00:00
parent 1ee3c59dc7
commit 2f0f3390f8
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

@@ -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

7
container-images/overcloud_containers.yaml.j2
View File

@@ -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