opendev/system-config
Code Issues Proposed changes

Fix logstash filter location

Browse Source 
Change-Id: I70fbe2a9ba0ab909002704ff97b5ee149040e742
This commit is contained in:
James E. Blair 2019-04-20 09:29:53 -07:00
parent e01ed4f066
commit 8b2a4dbedd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/logstash_worker.pp
View File

@ -17,7 +17,7 @@
class openstack_project::logstash_worker ( class openstack_project::logstash_worker (
$discover_node = 'elasticsearch01.openstack.org', $discover_node = 'elasticsearch01.openstack.org',
$filter_rev = 'master', $filter_rev = 'master',
$filter_source = 'https://git.openstack.org/openstack-infra/logstash-filters', $filter_source = 'https://git.openstack.org/openstack/logstash-filters',
$enable_mqtt = true, $enable_mqtt = true,
$mqtt_hostname = 'firehose.openstack.org', $mqtt_hostname = 'firehose.openstack.org',
$mqtt_port = 8883, $mqtt_port = 8883,

6
tools/logstash-filter-test.sh
View File

@ -18,13 +18,13 @@
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
https://git.openstack.org \ https://git.openstack.org \
openstack-infra/logstash-filters openstack/logstash-filters
sha=$(git --git-dir=/tmp/openstack-infra/logstash-filters/.git rev-parse HEAD) sha=$(git --git-dir=/tmp/openstack/logstash-filters/.git rev-parse HEAD)
cat > node.pp <<EOF cat > node.pp <<EOF
\$elasticsearch_nodes = [ 'localhost' ] \$elasticsearch_nodes = [ 'localhost' ]
class { 'openstack_project::logstash_worker': class { 'openstack_project::logstash_worker':
filter_source => 'file:///tmp/openstack-infra/logstash-filters/.git', filter_source => 'file:///tmp/openstack/logstash-filters/.git',
filter_rev => '$sha', filter_rev => '$sha',
} }
EOF EOF