Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378052 )
Change subject: designate: open api to labmon
......................................................................
designate: open api to labmon
Change-Id: I68152bf7b097af394bec292a808d483e0c3726e8
---
M hieradata/common/profile/openstack/base.yaml
M modules/profile/manifests/openstack/base/designate/service.pp
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/hieradata/common/profile/openstack/base.yaml
b/hieradata/common/profile/openstack/base.yaml
index 7c246e3..d91c35c 100644
--- a/hieradata/common/profile/openstack/base.yaml
+++ b/hieradata/common/profile/openstack/base.yaml
@@ -5,3 +5,4 @@
profile::openstack::base::ldap_user_name_attribute: 'cn'
profile::openstack::base::ldap_user_dn:
'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
profile::openstack::base::salt_hosts: '208.80.154.14 208.80.153.74
208.80.155.119'
+profile::openstack::base::monitoring_host: 'labmon1001.eqiad.wmnet'
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: merged
Gerrit-Change-Id: I68152bf7b097af394bec292a808d483e0c3726e8
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
