Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378052 )
Change subject: designate: open api to labmon
......................................................................
designate: open api to labmon
Change-Id: I68152bf7b097af394bec292a808d483e0c3726e8
---
M hieradata/codfw/profile/openstack/labtest.yaml
M hieradata/codfw/profile/openstack/labtestn.yaml
M hieradata/eqiad/profile/openstack/main.yaml
M modules/profile/manifests/openstack/base/designate/service.pp
4 files changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/378052/1
diff --git a/hieradata/codfw/profile/openstack/labtest.yaml
b/hieradata/codfw/profile/openstack/labtest.yaml
index 73fd91f..475f0ab 100644
--- a/hieradata/codfw/profile/openstack/labtest.yaml
+++ b/hieradata/codfw/profile/openstack/labtest.yaml
@@ -7,6 +7,7 @@
profile::openstack::labtest::nova_api_host: 'labtestnet2001.codfw.wmnet'
profile::openstack::labtest::labs_hosts_range: '10.192.20.0/24'
profile::openstack::labtest::horizon_host: 'labtestweb2001.wikimedia.org'
+profile::openstack::labtest::monitoring_host: 'labmon1001.eqiad.wmnet'
profile::openstack::labtest::spice_hostname: 'labtestspice.wikimedia.org'
profile::openstack::labtest::nova_network_host: 'labtestnet2001.codfw.wmnet'
profile::openstack::labtest::rabbit_monitor_user: 'monitoring'
diff --git a/hieradata/codfw/profile/openstack/labtestn.yaml
b/hieradata/codfw/profile/openstack/labtestn.yaml
index c44108b..5723b26 100644
--- a/hieradata/codfw/profile/openstack/labtestn.yaml
+++ b/hieradata/codfw/profile/openstack/labtestn.yaml
@@ -7,6 +7,7 @@
profile::openstack::labtestn::puppetmaster_hostname:
'labtestpuppetmaster2001.wikimedia.org'
profile::openstack::labtestn::labs_hosts_range: '127.0.0.1/32'
profile::openstack::labtestn::horizon_host: 'labtestweb2001.wikimedia.org'
+profile::openstack::labtestn::monitoring_host: 'labmon1001.eqiad.wmnet'
profile::openstack::labtestn::spice_hostname: 'labtestnspice.wikimedia.org'
profile::openstack::labtestn::nova_network_host: 'labtestnet2002.codfw.wmnet'
profile::openstack::labtestn::rabbit_monitor_user: 'monitoring'
diff --git a/hieradata/eqiad/profile/openstack/main.yaml
b/hieradata/eqiad/profile/openstack/main.yaml
index 6bb2399..644aee1 100644
--- a/hieradata/eqiad/profile/openstack/main.yaml
+++ b/hieradata/eqiad/profile/openstack/main.yaml
@@ -7,6 +7,7 @@
profile::openstack::main::designate_host_standby:
'labservices1002.wikimedia.org'
profile::openstack::main::puppetmaster_hostname:
'labs-puppetmaster.wikimedia.org'
profile::openstack::main::horizon_host: 'californium.wikimedia.org'
+profile::openstack::main::monitoring_host: 'labmon1001.eqiad.wmnet'
profile::openstack::main::spice_hostname: 'labspice.wikimedia.org'
profile::openstack::main::labs_hosts_range: '10.64.20.0/24'
profile::openstack::main::osm_host: 'wikitech.wikimedia.org'
diff --git a/modules/profile/manifests/openstack/base/designate/service.pp
b/modules/profile/manifests/openstack/base/designate/service.pp
index 1c5d1e4..507f634 100644
--- a/modules/profile/manifests/openstack/base/designate/service.pp
+++ b/modules/profile/manifests/openstack/base/designate/service.pp
@@ -24,6 +24,7 @@
$keystone_auth_port =
hiera('profile::openstack::base::keystone::auth_port'),
$osm_host = hiera('profile::openstack::base::osm_host'),
$horizon_host = hiera('profile::openstack::base::horizon_host'),
+ $monitoring_host = hiera('profile::openstack::base::monitoring_host'),
) {
$primary_pdns_ip = ipresolve($primary_pdns,4)
@@ -59,7 +60,7 @@
# Open designate API to Labs web UIs and the commandline on labcontrol
ferm::rule { 'designate-api':
- rule => "saddr (@resolve(${osm_host}) @resolve(${horizon_host})
@resolve(${nova_controller})) proto tcp dport (9001) ACCEPT;",
+ rule => "saddr (@resolve(${osm_host}) @resolve(${horizon_host})
@resolve(${nova_controller}) @resolve(${monitoring_host})) proto tcp dport
(9001) ACCEPT;",
}
# Allow labs instances to hit the designate api.
--
To view, visit https://gerrit.wikimedia.org/r/378052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68152bf7b097af394bec292a808d483e0c3726e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
