openstack
/
tripleo-common
Code Issues Proposed changes

Rsyslog image pull 

This patch enables assignment of rsyslog container image
to rsyslog composable service and unifies sidecar service
to use the full featured image instead

Change-Id: I4e67e4ec1448f005c9d2d861fc729112a0954aa9
This commit is contained in:
Juan Badia Payno 2018-12-11 10:12:16 +01:00 committed by Martin Mágr
parent 217985840b
commit 0e08cc7466
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
container-images/overcloud_containers.yaml
View File

@ -209,7 +209,7 @@ container_images:
image_source: grafana
- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-rsyslog-base:current-tripleo
- imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo
image_source: kolla
- imagename: docker.io/openshift/origin-ansible:v3.11.0
image_source: openshift

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

@ -905,13 +905,16 @@ container_images_template:
services:
- OS::TripleO::Services::Tempest
- imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}"
- imagename: "{{namespace}}/{{name_prefix}}rsyslog{{name_suffix}}:{{tag}}"
image_source: kolla
params:
- ContainerRsyslogImage
- ContainerRsyslogConfigImage
- ContainerRsyslogSidecarImage
- ContainerRsyslogSidecarConfigImage
services:
- OS::TripleO::Services::HAproxy
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::SwiftProxy
- OS::TripleO::Services::SwiftStorage