openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Comment out tacker image until service is ready"

This commit is contained in:
Zuul 2017-12-21 19:08:31 +00:00 committed by Gerrit Code Review
parent 84f4c1c2e0 be2080689e
commit eb2389c354
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

@ -92,7 +92,6 @@ container_images:
- imagename: docker.io/tripleoupstream/centos-binary-swift-container:latest - 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-object:latest
- imagename: docker.io/tripleoupstream/centos-binary-swift-proxy-server: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/tripleoupstream/centos-binary-zaqar:latest
- imagename: docker.io/ceph/daemon:tag-stable-3.0-luminous-centos-7 - imagename: docker.io/ceph/daemon:tag-stable-3.0-luminous-centos-7
- imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest - imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest

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

@ -674,12 +674,16 @@ container_images_template:
- OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::SwiftRingBuilder
- OS::TripleO::Services::SwiftStorage - OS::TripleO::Services::SwiftStorage
- imagename: "{{namespace}}/{{name_prefix}}tacker{{name_suffix}}:{{tag}}" # The kolla tacker image was split into base, conductor and server images in
params: # kolla review https://review.openstack.org/#/c/477494/
- DockerTackerConfigImage # Uncomment when TripleO has caught up with the change.
- DockerTackerImage # https://bugs.launchpad.net/tripleo/+bug/1714270
services: # - imagename: "{{namespace}}/{{name_prefix}}tacker{{name_suffix}}:{{tag}}"
- OS::TripleO::Services::Tacker # params:
# - DockerTackerConfigImage
# - DockerTackerImage
# services:
# - OS::TripleO::Services::Tacker
- imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}" - imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}"
params: params: