openstack/tripleo-common
Code Issues Proposed changes

Merge "Add tempest container"

Browse Source
This commit is contained in:
Zuul
2018-01-26 06:09:30 +00:00
committed by Gerrit Code Review
parent 4c35fae95f f7110a2896
commit b78d7acb89
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
container-images/overcloud_containers.yaml
View File

@@ -95,4 +95,5 @@ container_images:
- 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-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-tempest:latest
- imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest - imagename: docker.io/tripleoupstream/centos-binary-rsyslog-base:latest

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

@@ -713,6 +713,10 @@ container_images_template:
- OS::TripleO::Services::CephRgw - OS::TripleO::Services::CephRgw
- OS::TripleO::Services::CephRbdMirror - OS::TripleO::Services::CephRbdMirror
- imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}"
params: None
services: None
{% if logging == "stdout" %} {% if logging == "stdout" %}
- imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}" - imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}"
params: params: