Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387366 )
Change subject: openstack: labtestpuppetmaster params adjustments
......................................................................
openstack: labtestpuppetmaster params adjustments
A few pieces were confusingly missing in the
compiler output.
Bug: T171494
Change-Id: I7febc87353d66c0a1d5501cb357468a56164f98b
---
M hieradata/codfw/profile/openstack/labtest.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
M modules/profile/manifests/openstack/base/puppetmaster/backend.pp
M modules/profile/manifests/openstack/base/puppetmaster/common.pp
M modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
M modules/profile/manifests/openstack/main/puppetmaster/backend.pp
6 files changed, 47 insertions(+), 39 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw/profile/openstack/labtest.yaml
b/hieradata/codfw/profile/openstack/labtest.yaml
index 7ea2a2c..18d47d0 100644
--- a/hieradata/codfw/profile/openstack/labtest.yaml
+++ b/hieradata/codfw/profile/openstack/labtest.yaml
@@ -13,4 +13,4 @@
profile::openstack::labtest::rabbit_file_handles: 8192
profile::openstack::labtest::osm_host: 'labtestwikitech.wikimedia.org'
profile::openstack::labtest::ldap_hosts: ['labtestservices2001.wikimedia.org']
-profile::openstack::labtest::statsd_host: '127.0.0.1'
+profile::openstack::labtest::statsd_host: 'labmon1001.eqiad.wmnet'
diff --git
a/hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
b/hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
index 860e79e..bc5cdea 100644
--- a/hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
+++ b/hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
@@ -3,3 +3,5 @@
profile::puppetmaster::common::storeconfigs: none
profile::conftool::master::sync_dir: "/etc/conftool/data"
profile::discovery::path: "/srv/config-master/discovery"
+profile::discovery::watch_interval: 60
+profile::puppetmaster::frontend::prevent_cherrypicks: false
diff --git a/modules/profile/manifests/openstack/base/puppetmaster/backend.pp
b/modules/profile/manifests/openstack/base/puppetmaster/backend.pp
index eaf588b..f42cd34 100644
--- a/modules/profile/manifests/openstack/base/puppetmaster/backend.pp
+++ b/modules/profile/manifests/openstack/base/puppetmaster/backend.pp
@@ -2,6 +2,7 @@
$labs_instance_range =
hiera('profile::openstack::base::nova::fixed_range'),
$horizon_host = hiera('profile::openstack::base::horizon_host'),
$designate_host = hiera('profile::openstack::base::designate_host'),
+ $puppetmaster_webhostname =
hiera('profile::openstack::base::puppetmaster::web_hostname'),
$puppetmaster_hostname =
hiera('profile::openstack::base::puppetmaster_hostname'),
$puppetmaster_ca = hiera('profile::openstack::base::puppetmaster::ca'),
$puppetmasters = hiera('profile::openstack::base::puppetmaster::servers'),
@@ -17,18 +18,19 @@
require ::profile::conftool::client
include ::network::constants
class {'profile::openstack::base::puppetmaster::common':
- labs_instance_range => $labs_instance_range,
- horizon_host => $horizon_host,
- designate_host => $designate_host,
- puppetmaster_hostname => $puppetmaster_hostname,
- puppetmasters => $puppetmasters,
- baremetal_servers => $baremetal_servers,
- encapi_db_host => $encapi_db_host,
- encapi_db_name => $encapi_db_name,
- encapi_db_user => $encapi_db_user,
- encapi_db_pass => $encapi_db_pass,
- encapi_statsd_prefix => $encapi_statsd_prefix,
- statsd_host => $statsd_host,
+ labs_instance_range => $labs_instance_range,
+ horizon_host => $horizon_host,
+ designate_host => $designate_host,
+ puppetmaster_webhostname => $puppetmaster_webhostname,
+ puppetmaster_hostname => $puppetmaster_hostname,
+ puppetmasters => $puppetmasters,
+ baremetal_servers => $baremetal_servers,
+ encapi_db_host => $encapi_db_host,
+ encapi_db_name => $encapi_db_name,
+ encapi_db_user => $encapi_db_user,
+ encapi_db_pass => $encapi_db_pass,
+ encapi_statsd_prefix => $encapi_statsd_prefix,
+ statsd_host => $statsd_host,
}
# Only allow puppet access from the instances
diff --git a/modules/profile/manifests/openstack/base/puppetmaster/common.pp
b/modules/profile/manifests/openstack/base/puppetmaster/common.pp
index d04d4df..3b0e08f 100644
--- a/modules/profile/manifests/openstack/base/puppetmaster/common.pp
+++ b/modules/profile/manifests/openstack/base/puppetmaster/common.pp
@@ -2,6 +2,7 @@
$labs_instance_range =
hiera('profile::openstack::base::puppetmaster::common::labs_instance_range'),
$horizon_host =
hiera('profile::openstack::base::puppetmaster::common::horizon_host'),
$designate_host =
hiera('profile::openstack::base::puppetmaster::common::designate_host'),
+ $puppetmaster_webhostname =
hiera('profile::openstack::base::puppetmaster::web_hostname'),
$puppetmaster_hostname =
hiera('profile::openstack::base::puppetmaster::common::puppetmaster_hostname'),
$puppetmasters =
hiera('profile::openstack::base::puppetmaster::common::puppetmasters'),
$baremetal_servers =
hiera('profile::openstack::base::puppetmaster::common::baremetal_servers'),
@@ -20,7 +21,7 @@
class {'::puppetmaster::labsrootpass':}
class {'::openstack2::puppet::master::enc':
- puppetmaster => $puppetmaster_hostname,
+ puppetmaster => $puppetmaster_webhostname,
}
class { '::openstack2::puppet::master::encapi':
diff --git a/modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
b/modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
index ebc46c0..6ad1558 100644
--- a/modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
+++ b/modules/profile/manifests/openstack/base/puppetmaster/frontend.pp
@@ -34,18 +34,19 @@
}
class {'profile::openstack::base::puppetmaster::common':
- labs_instance_range => $labs_instance_range,
- horizon_host => $horizon_host,
- designate_host => $designate_host,
- puppetmaster_hostname => $puppetmaster_hostname,
- puppetmasters => $puppetmasters,
- baremetal_servers => $baremetal_servers,
- encapi_db_host => $encapi_db_host,
- encapi_db_name => $encapi_db_name,
- encapi_db_user => $encapi_db_user,
- encapi_db_pass => $encapi_db_pass,
- encapi_statsd_prefix => $encapi_statsd_prefix,
- statsd_host => $statsd_host,
+ labs_instance_range => $labs_instance_range,
+ horizon_host => $horizon_host,
+ designate_host => $designate_host,
+ puppetmaster_webhostname => $puppetmaster_webhostname,
+ puppetmaster_hostname => $puppetmaster_hostname,
+ puppetmasters => $puppetmasters,
+ baremetal_servers => $baremetal_servers,
+ encapi_db_host => $encapi_db_host,
+ encapi_db_name => $encapi_db_name,
+ encapi_db_user => $encapi_db_user,
+ encapi_db_pass => $encapi_db_pass,
+ encapi_statsd_prefix => $encapi_statsd_prefix,
+ statsd_host => $statsd_host,
}
if ! defined(Class['puppetmaster::certmanager']) {
diff --git a/modules/profile/manifests/openstack/main/puppetmaster/backend.pp
b/modules/profile/manifests/openstack/main/puppetmaster/backend.pp
index 047e9f7..6b59cc3 100644
--- a/modules/profile/manifests/openstack/main/puppetmaster/backend.pp
+++ b/modules/profile/manifests/openstack/main/puppetmaster/backend.pp
@@ -4,6 +4,7 @@
$designate_host = hiera('profile::openstack::main::designate_host'),
$puppetmaster_hostname =
hiera('profile::openstack::main::puppetmaster_hostname'),
$puppetmaster_ca = hiera('profile::openstack::main::puppetmaster::ca'),
+ $puppetmaster_webhostname =
hiera('profile::openstack::main::puppetmaster::web_hostname'),
$puppetmasters = hiera('profile::openstack::main::puppetmaster::servers'),
$baremetal_servers =
hiera('profile::openstack::main::puppetmaster::baremetal'),
$encapi_db_host =
hiera('profile::openstack::main::puppetmaster::encapi::db_host'),
@@ -17,18 +18,19 @@
require ::profile::openstack::main::clientlib
include ::profile::openstack::main::cumin::master
class {'::profile::openstack::base::puppetmaster::backend':
- labs_instance_range => $labs_instance_range,
- horizon_host => $horizon_host,
- designate_host => $designate_host,
- puppetmaster_ca => $puppetmaster_ca,
- puppetmaster_hostname => $puppetmaster_hostname,
- puppetmasters => $puppetmasters,
- baremetal_servers => $baremetal_servers,
- encapi_db_host => $encapi_db_host,
- encapi_db_name => $encapi_db_name,
- encapi_db_user => $encapi_db_user,
- encapi_db_pass => $encapi_db_pass,
- encapi_statsd_prefix => $encapi_statsd_prefix,
- statsd_host => $statsd_host,
+ labs_instance_range => $labs_instance_range,
+ horizon_host => $horizon_host,
+ designate_host => $designate_host,
+ puppetmaster_webhostname => $puppetmaster_webhostname,
+ puppetmaster_ca => $puppetmaster_ca,
+ puppetmaster_hostname => $puppetmaster_hostname,
+ puppetmasters => $puppetmasters,
+ baremetal_servers => $baremetal_servers,
+ encapi_db_host => $encapi_db_host,
+ encapi_db_name => $encapi_db_name,
+ encapi_db_user => $encapi_db_user,
+ encapi_db_pass => $encapi_db_pass,
+ encapi_statsd_prefix => $encapi_statsd_prefix,
+ statsd_host => $statsd_host,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/387366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7febc87353d66c0a1d5501cb357468a56164f98b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[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
