diff --git a/hiera/common.yaml b/hiera/common.yaml index d35991948f..8ac56af070 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -28,6 +28,27 @@ elasticsearch_clients: - logstash-worker18.openstack.org - logstash-worker19.openstack.org - logstash-worker20.openstack.org +logstash_gearman_clients: +- logstash-worker01.openstack.org +- logstash-worker02.openstack.org +- logstash-worker03.openstack.org +- logstash-worker04.openstack.org +- logstash-worker05.openstack.org +- logstash-worker06.openstack.org +- logstash-worker07.openstack.org +- logstash-worker08.openstack.org +- logstash-worker09.openstack.org +- logstash-worker10.openstack.org +- logstash-worker11.openstack.org +- logstash-worker12.openstack.org +- logstash-worker13.openstack.org +- logstash-worker14.openstack.org +- logstash-worker15.openstack.org +- logstash-worker16.openstack.org +- logstash-worker17.openstack.org +- logstash-worker18.openstack.org +- logstash-worker19.openstack.org +- logstash-worker20.openstack.org - subunit-worker01.openstack.org - subunit-worker02.openstack.org - ze01.openstack.org diff --git a/manifests/site.pp b/manifests/site.pp index 808b74ef72..160045be1f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -7,6 +7,7 @@ # $elasticsearch_nodes = hiera_array('elasticsearch_nodes') $elasticsearch_clients = hiera_array('elasticsearch_clients') +$logstash_gearman_clients = hiera_array('logstash_gearman_clients') # # Default: should at least behave like an openstack server @@ -468,7 +469,7 @@ node /^wiki-dev\d+\.openstack\.org$/ { node /^logstash\d*\.openstack\.org$/ { $iptables_es_rule = regsubst($elasticsearch_nodes, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 9200:9400 -s \1 -j ACCEPT') - $iptables_gm_rule = regsubst($elasticsearch_clients, + $iptables_gm_rule = regsubst($logstash_gearman_clients, '^(.*)$', '-m state --state NEW -m tcp -p tcp --dport 4730 -s \1 -j ACCEPT') $logstash_iptables_rule = flatten([$iptables_es_rule, $iptables_gm_rule])