Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387625 )
Change subject: openstack: move main hiera deployment config to common
......................................................................
openstack: move main hiera deployment config to common
These need to be seen by equipment at both sites. An example
is the m5 database server in codfw needs to be able to lookup
the main components. It is possible to move the entire
key trees for deployments to common, but without a reason
I'm holding status quo.
Bug: T171494
Change-Id: I499c60ee01af581615bca6808d8830dfbd0e7c7f
---
D hieradata/codfw/profile/openstack/main.yaml
D hieradata/codfw/profile/openstack/main/cumin.yaml
D hieradata/codfw/profile/openstack/main/nova.yaml
R hieradata/common/profile/openstack/labtest.yaml
R hieradata/common/profile/openstack/labtestn.yaml
R hieradata/common/profile/openstack/main.yaml
M modules/role/manifests/mariadb/ferm_wmcs.pp
7 files changed, 8 insertions(+), 16 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
diff --git a/hieradata/codfw/profile/openstack/main.yaml
b/hieradata/codfw/profile/openstack/main.yaml
deleted file mode 100644
index 9d9626b..0000000
--- a/hieradata/codfw/profile/openstack/main.yaml
+++ /dev/null
@@ -1 +0,0 @@
-profile::openstack::main::nova_controller: "labcontrol2001.wikimedia.org"
diff --git a/hieradata/codfw/profile/openstack/main/cumin.yaml
b/hieradata/codfw/profile/openstack/main/cumin.yaml
deleted file mode 100644
index 7d510f3..0000000
--- a/hieradata/codfw/profile/openstack/main/cumin.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-profile::openstack::main::cumin::project_masters: []
-profile::openstack::main::cumin::project_pub_key: undef
-profile::openstack::main::cumin::project_ssh_priv_key_path: undef
-profile::openstack::main::cumin::aliases:
- all: 'O{*} and not O{project:contintcloud} and not
O{project:admin-monitoring}'
diff --git a/hieradata/codfw/profile/openstack/main/nova.yaml
b/hieradata/codfw/profile/openstack/main/nova.yaml
deleted file mode 100644
index 814a3e7..0000000
--- a/hieradata/codfw/profile/openstack/main/nova.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-profile::openstack::main::nova::dhcp_domain: 'codfw.labtest'
-profile::openstack::main::nova::dhcp_start: '10.196.16.4'
diff --git a/hieradata/codfw/profile/openstack/labtest.yaml
b/hieradata/common/profile/openstack/labtest.yaml
similarity index 100%
rename from hieradata/codfw/profile/openstack/labtest.yaml
rename to hieradata/common/profile/openstack/labtest.yaml
diff --git a/hieradata/codfw/profile/openstack/labtestn.yaml
b/hieradata/common/profile/openstack/labtestn.yaml
similarity index 100%
rename from hieradata/codfw/profile/openstack/labtestn.yaml
rename to hieradata/common/profile/openstack/labtestn.yaml
diff --git a/hieradata/eqiad/profile/openstack/main.yaml
b/hieradata/common/profile/openstack/main.yaml
similarity index 100%
rename from hieradata/eqiad/profile/openstack/main.yaml
rename to hieradata/common/profile/openstack/main.yaml
diff --git a/modules/role/manifests/mariadb/ferm_wmcs.pp
b/modules/role/manifests/mariadb/ferm_wmcs.pp
index 1097628..5072baa 100644
--- a/modules/role/manifests/mariadb/ferm_wmcs.pp
+++ b/modules/role/manifests/mariadb/ferm_wmcs.pp
@@ -2,14 +2,14 @@
# We need special rules to allow access for openstack services (which
typically
# run on hosts with public IPs)
-class role::mariadb::ferm_wmcs {
-
- $nova_controller = 'labcontrol1001.wikimedia.org'
- $nova_controller_standby = 'labcontrol1002.wikimedia.org'
- $designate_host = 'labservices1001.wikimedia.org'
- $designate_host_standby = 'labservices1002.wikimedia.org'
- $horizon_host = 'californium.wikimedia.org'
- $osm_host = 'silver.wikimedia.org'
+class role::mariadb::ferm_wmcs(
+ $nova_controller = hiera('profile::openstack::main::nova_controller'),
+ $nova_controller_standby =
hiera('profile::openstack::main::nova_controller_standby'),
+ $designate_host = hiera('profile::openstack::main::designate_host'),
+ $designate_host_standby =
hiera('profile::openstack::main::designate_host_standby'),
+ $horizon_host = hiera('profile::openstack::main::horizon_host'),
+ $osm_host = hiera('profile::openstack::main::osm_host'),
+ ) {
ferm::service{ 'nova_controller':
proto => 'tcp',
--
To view, visit https://gerrit.wikimedia.org/r/387625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I499c60ee01af581615bca6808d8830dfbd0e7c7f
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[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
