opendev
/
system-config
Code Issues Proposed changes

Merge "Add nb03 matching, firewall and monitoring"

This commit is contained in:
Zuul 2018-02-21 21:20:27 +00:00 committed by Gerrit Code Review
parent 9ab54c19e6 b1ead43061
commit 778ecb5a97
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/common.yaml
View File

@ -478,6 +478,7 @@ cacti_hosts:
- logstash.openstack.org
- nb01.openstack.org
- nb02.openstack.org
- nb03.openstack.org
- nl01.openstack.org
- nl02.openstack.org
- nl03.openstack.org

4
manifests/site.pp
View File

@ -788,6 +788,7 @@ node /^zk\d+\.openstack\.org$/ {
# Zookeeper clients
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nb02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nb03.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl01.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
@ -934,6 +935,7 @@ node 'nodepool.openstack.org' {
iptables_allowed_hosts => [
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nb02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nb03.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl01.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
@ -1068,7 +1070,7 @@ node /^nl\d+\.openstack\.org$/ {
}
# Node-OS: xenial
node /^nb0[12].openstack\.org$/ {
node /^nb\d+\.openstack\.org$/ {
$group = 'nodepool'
# TODO(pabelanger): Move all of this back into nodepool manifest, it has
# grown too big.