Merge "Add nb03 matching, firewall and monitoring"
This commit is contained in:
commit
778ecb5a97
@ -478,6 +478,7 @@ cacti_hosts:
|
|||||||
- logstash.openstack.org
|
- logstash.openstack.org
|
||||||
- nb01.openstack.org
|
- nb01.openstack.org
|
||||||
- nb02.openstack.org
|
- nb02.openstack.org
|
||||||
|
- nb03.openstack.org
|
||||||
- nl01.openstack.org
|
- nl01.openstack.org
|
||||||
- nl02.openstack.org
|
- nl02.openstack.org
|
||||||
- nl03.openstack.org
|
- nl03.openstack.org
|
||||||
|
@ -788,6 +788,7 @@ node /^zk\d+\.openstack\.org$/ {
|
|||||||
# Zookeeper clients
|
# Zookeeper clients
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nb02.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 => 'nl01.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
|
||||||
@ -934,6 +935,7 @@ node 'nodepool.openstack.org' {
|
|||||||
iptables_allowed_hosts => [
|
iptables_allowed_hosts => [
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nb01.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nb02.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 => 'nl01.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nl02.openstack.org'},
|
||||||
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
|
{protocol => 'tcp', port => '2181', hostname => 'nl03.openstack.org'},
|
||||||
@ -1068,7 +1070,7 @@ node /^nl\d+\.openstack\.org$/ {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: xenial
|
# Node-OS: xenial
|
||||||
node /^nb0[12].openstack\.org$/ {
|
node /^nb\d+\.openstack\.org$/ {
|
||||||
$group = 'nodepool'
|
$group = 'nodepool'
|
||||||
# TODO(pabelanger): Move all of this back into nodepool manifest, it has
|
# TODO(pabelanger): Move all of this back into nodepool manifest, it has
|
||||||
# grown too big.
|
# grown too big.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user