openstack
/
kolla
Code Issues Proposed changes

Merge "Unbreak CI: fluentd and TripleO dependency"

This commit is contained in:
Zuul 2019-08-19 13:18:54 +00:00 committed by Gerrit Code Review
parent 1e95081f06 07b55048e6
commit 6320b05f71
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.zuul.d/centos.yaml
View File

@ -8,7 +8,8 @@
- kolla-ansible-centos-binary
- kolla-ansible-centos-source-upgrade
- tripleo-build-containers-centos-7:
voting: true
# FIXME(yoctozepto): set to voting when TripleO CI is fixed
voting: false
files:
- ^.zuul.d/centos.yaml$
- ^docker/.*$
@ -34,7 +35,8 @@
jobs:
- kolla-build-centos-source
- tripleo-build-containers-centos-7:
voting: true
# FIXME(yoctozepto): set to voting when TripleO CI is fixed
voting: false
files:
- ^.zuul.d/centos.yaml$
- ^docker/.*$

2
docker/fluentd/Dockerfile.j2
View File

@ -21,7 +21,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ruby-devel',
'rubygem-fluent-plugin-elasticsearch',
'rubygem-fluent-plugin-grok-parser',
'rubygem-fluent-plugin-kubernetes_metadata_filter',
'rubygem-fluent-plugin-rewrite-tag-filter',
'rubygem-fluent-plugin-secure-forward'
] %}
@ -83,7 +82,6 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
'fluent-plugin-elasticsearch',
'fluent-plugin-grep',
'fluent-plugin-grok-parser:2.1.4',
'fluent-plugin-kubernetes_metadata_filter',
'fluent-plugin-parser',
'fluent-plugin-rewrite-tag-filter:2.0.0',
'fluent-plugin-secure-forward',