Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288015
Change subject: Move several Labs IPs and IP ranges into Hiera.
......................................................................
Move several Labs IPs and IP ranges into Hiera.
These are used to set up the firewall; we need them
to vary properly in labtest.
Change-Id: I3ead77bfb043844545a221b61b2eb68c9a7d3297
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/role/manifests/labs/openstack/nova.pp
3 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/288015/1
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index bc548f3..61fa2ec 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -14,6 +14,7 @@
labs_osm_host: "labtestwikitech.wikimedia.org"
labs_horizon_host: "labtestweb2001.wikimedia.org"
+labs_host_ips: '10.192.20.0/24'
labs_designate_hostname: &labsdesignatehostname
"labtestservices2001.wikimedia.org"
labs_designate_hostname_secondary: &labs_designate_hostname_secondary
"labtestservices2001.wikimedia.org"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index a667305..88e5f74 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -96,6 +96,7 @@
labs_osm_host: "wikitech.wikimedia.org"
labs_horizon_host: "californium.wikimedia.org"
+labs_host_ips: '10.64.20.0/24'
# These are the up-and-coming, better dns servers:
labsdnsconfig:
diff --git a/modules/role/manifests/labs/openstack/nova.pp
b/modules/role/manifests/labs/openstack/nova.pp
index 5e8cb88..665fe85 100644
--- a/modules/role/manifests/labs/openstack/nova.pp
+++ b/modules/role/manifests/labs/openstack/nova.pp
@@ -158,16 +158,16 @@
}
# TOBE: hiera'd
- $labs_vms = '10.68.16.0/21'
+ $labs_vms = novaconfig['fixed_range']
$labs_metal = join(hiera('labs_baremetal_servers', []), ' ')
- $wikitech = '208.80.154.136'
- $horizon = '208.80.154.147'
+ $wikitech = ipresolve(hiera('labs_osm_host'),4)
+ $horizon = ipresolve(hiera('labs_horizon_host'),4)
$api_host = ipresolve(hiera('labs_nova_api_host'),4)
$spare_master = ipresolve(hiera('labs_nova_controller_spare'),4)
$designate = ipresolve(hiera('labs_designate_hostname'),4)
$designate_secondary =
ipresolve(hiera('labs_designate_hostname_secondary'))
$monitoring = '208.80.154.14'
- $labs_nodes = '10.64.20.0/24'
+ $labs_nodes = hiera('labs_host_ips')
# mysql access from iron
ferm::service { 'mysql_iron':
--
To view, visit https://gerrit.wikimedia.org/r/288015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ead77bfb043844545a221b61b2eb68c9a7d3297
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
