[MediaWiki-commits] [Gerrit] operations/puppet[production]: hiera: convert expand_path hierarchies to use full key
Giuseppe Lavagetto has submitted this change and it was merged. Change subject: hiera: convert expand_path hierarchies to use full key .. hiera: convert expand_path hierarchies to use full key Bug: T147403 Change-Id: I79c0e7880a30ceca10825730fbebca7d49e11bfc --- M hieradata/codfw/labtest-instances.yaml M hieradata/codfw/mediawiki/jobrunner.yaml M hieradata/codfw/puppetmaster/config.yaml M hieradata/codfw/swift.yaml M hieradata/codfw/swift/params.yaml M hieradata/codfw/swift/proxy.yaml M hieradata/common/base/remote_syslog.yaml M hieradata/common/cache/ipsec/kafka.yaml M hieradata/common/cache/maps.yaml M hieradata/common/cache/misc.yaml M hieradata/common/cache/text.yaml M hieradata/common/cache/upload.yaml M hieradata/common/contint.yaml M hieradata/common/dataset.yaml M hieradata/common/discovery.yaml M hieradata/common/dnsrecursor/labsaliaser.yaml M hieradata/common/lvs/configuration.yaml M hieradata/common/mediawiki.yaml M hieradata/common/mediawiki/redis_servers.yaml M hieradata/common/monitoring.yaml M hieradata/common/network.yaml M hieradata/common/nrpe.yaml M hieradata/common/ocg.yaml M hieradata/common/ocg/ganglia.yaml M hieradata/common/openstack.yaml M hieradata/common/puppetmaster.yaml M hieradata/common/puppetmaster/config.yaml M hieradata/common/puppetmaster/puppetdb.yaml M hieradata/common/role/cache/2layer.yaml M hieradata/common/role/deployment.yaml M hieradata/common/scap.yaml M hieradata/common/scap/dsh.yaml M hieradata/common/service/configuration.yaml M hieradata/common/statsite/instance.yaml M hieradata/common/swift.yaml M hieradata/common/swift/params.yaml M hieradata/common/swift/proxy.yaml M hieradata/common/swift/storage.yaml M hieradata/common/zookeeper.yaml M hieradata/esams/swift.yaml M hieradata/esams/swift/params.yaml M hieradata/esams/swift/proxy.yaml 42 files changed, 77 insertions(+), 72 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/codfw/labtest-instances.yaml b/hieradata/codfw/labtest-instances.yaml index 6f251fc..e59573b 100644 --- a/hieradata/codfw/labtest-instances.yaml +++ b/hieradata/codfw/labtest-instances.yaml @@ -1,3 +1,8 @@ +# BEWARE: this file has been added to the production-realm +# hieradata, but it's not really for it; it is used by a different realm instead +# and the lookup logic is different than everywhere else. +# Because we love clarity and consistency. + puppetmaster: "labtestcontrol2001.wikimedia.org" saltmaster: "labtestcontrol2001.wikimedia.org" labs_puppet_master: "labtestcontrol2001.wikimedia.org" diff --git a/hieradata/codfw/mediawiki/jobrunner.yaml b/hieradata/codfw/mediawiki/jobrunner.yaml index 0704f69..f550b22 100644 --- a/hieradata/codfw/mediawiki/jobrunner.yaml +++ b/hieradata/codfw/mediawiki/jobrunner.yaml @@ -1,4 +1,4 @@ -queue_servers: +mediawiki::jobrunner::queue_servers: - rdb2001.codfw.wmnet:6379 - rdb2001.codfw.wmnet:6380 - rdb2001.codfw.wmnet:6381 @@ -11,9 +11,9 @@ - rdb2005.codfw.wmnet:6479 - rdb2005.codfw.wmnet:6480 - rdb2005.codfw.wmnet:6481 -aggr_servers: +mediawiki::jobrunner::aggr_servers: - rdb2001.codfw.wmnet:6378 - rdb2003.codfw.wmnet:6378 - rdb2005.codfw.wmnet:6378 # statsd is still in eqiad -statsd_server: statsd.eqiad.wmnet:8125 +mediawiki::jobrunner::statsd_server: statsd.eqiad.wmnet:8125 diff --git a/hieradata/codfw/puppetmaster/config.yaml b/hieradata/codfw/puppetmaster/config.yaml index 1d5e2a7..e2a72ba 100644 --- a/hieradata/codfw/puppetmaster/config.yaml +++ b/hieradata/codfw/puppetmaster/config.yaml @@ -1 +1 @@ -puppetdb_host: nihal.codfw.wmnet +puppetmaster::config::puppetdb_host: nihal.codfw.wmnet diff --git a/hieradata/codfw/swift.yaml b/hieradata/codfw/swift.yaml index 72e1221..b003cd7 100644 --- a/hieradata/codfw/swift.yaml +++ b/hieradata/codfw/swift.yaml @@ -1 +1 @@ -hash_path_suffix: 'de4227064232ed08' +swift::hash_path_suffix: 'de4227064232ed08' diff --git a/hieradata/codfw/swift/params.yaml b/hieradata/codfw/swift/params.yaml index a73479d..c48bbe5 100644 --- a/hieradata/codfw/swift/params.yaml +++ b/hieradata/codfw/swift/params.yaml @@ -1,5 +1,5 @@ -swift_cluster: codfw-prod -accounts: +swift::params::swift_cluster: codfw-prod +swift::params::accounts: super_admin: access: '.admin .reseller_admin' account_name: 'AUTH_admin' diff --git a/hieradata/codfw/swift/proxy.yaml b/hieradata/codfw/swift/proxy.yaml index fbcc4fe..8b3dba4 100644 --- a/hieradata/codfw/swift/proxy.yaml +++ b/hieradata/codfw/swift/proxy.yaml @@ -1,5 +1,5 @@ -proxy_service_host: 'ms-fe.svc.codfw.wmnet' -memcached_servers: [ +swift::proxy::proxy_service_host: 'ms-fe.svc.codfw.wmnet' +swift::proxy::memcached_servers: [ 'ms-fe2001.codfw.wmnet:11211', 'ms-fe2002.codfw.wmnet:11211', 'ms-fe2003.codfw.wmnet:11211', diff --git a/hieradata/common/base/remote_syslog.yaml
[MediaWiki-commits] [Gerrit] operations/puppet[production]: hiera: convert expand_path hierarchies to use full key
Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/315200 Change subject: hiera: convert expand_path hierarchies to use full key .. hiera: convert expand_path hierarchies to use full key Bug: T147403 Change-Id: I79c0e7880a30ceca10825730fbebca7d49e11bfc --- M hieradata/codfw/labtest-instances.yaml M hieradata/codfw/mediawiki/jobrunner.yaml M hieradata/codfw/puppetmaster/config.yaml M hieradata/codfw/swift.yaml M hieradata/codfw/swift/params.yaml M hieradata/codfw/swift/proxy.yaml M hieradata/common/base/remote_syslog.yaml M hieradata/common/cache/ipsec/kafka.yaml M hieradata/common/cache/maps.yaml M hieradata/common/cache/misc.yaml M hieradata/common/cache/text.yaml M hieradata/common/cache/upload.yaml M hieradata/common/contint.yaml M hieradata/common/dataset.yaml M hieradata/common/discovery.yaml M hieradata/common/dnsrecursor/labsaliaser.yaml M hieradata/common/lvs/configuration.yaml M hieradata/common/mediawiki.yaml M hieradata/common/mediawiki/redis_servers.yaml M hieradata/common/monitoring.yaml M hieradata/common/network.yaml M hieradata/common/nrpe.yaml M hieradata/common/ocg.yaml M hieradata/common/ocg/ganglia.yaml M hieradata/common/openstack.yaml M hieradata/common/puppetmaster.yaml M hieradata/common/puppetmaster/config.yaml M hieradata/common/puppetmaster/puppetdb.yaml M hieradata/common/role/cache/2layer.yaml M hieradata/common/role/deployment.yaml M hieradata/common/scap.yaml M hieradata/common/scap/dsh.yaml M hieradata/common/service/configuration.yaml M hieradata/common/statsite/instance.yaml M hieradata/common/swift.yaml M hieradata/common/swift/params.yaml M hieradata/common/swift/proxy.yaml M hieradata/common/swift/storage.yaml M hieradata/common/zookeeper.yaml M hieradata/esams/swift.yaml M hieradata/esams/swift/params.yaml M hieradata/esams/swift/proxy.yaml 42 files changed, 79 insertions(+), 79 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/00/315200/1 diff --git a/hieradata/codfw/labtest-instances.yaml b/hieradata/codfw/labtest-instances.yaml index 6f251fc..ca289ae 100644 --- a/hieradata/codfw/labtest-instances.yaml +++ b/hieradata/codfw/labtest-instances.yaml @@ -1,14 +1,14 @@ -puppetmaster: "labtestcontrol2001.wikimedia.org" -saltmaster: "labtestcontrol2001.wikimedia.org" -labs_puppet_master: "labtestcontrol2001.wikimedia.org" -ldap_host: "labtestservices2001.wikimedia.org" +labtest-instances::puppetmaster: "labtestcontrol2001.wikimedia.org" +labtest-instances::saltmaster: "labtestcontrol2001.wikimedia.org" +labtest-instances::labs_puppet_master: "labtestcontrol2001.wikimedia.org" +labtest-instances::ldap_host: "labtestservices2001.wikimedia.org" -labsdnsconfig: +labtest-instances::labsdnsconfig: recursor: 'labtest-recursor0.wikimedia.org' recursor_secondary: 'labtest-recursor0.wikimedia.org' -labsldapconfig: +labtest-instances::labsldapconfig: hostname: "labtestservices2001.wikimedia.org" secondary_hostname: "labtestservices2001.wikimedia.org" -labs_tld: "labtest" +labtest-instances::labs_tld: "labtest" diff --git a/hieradata/codfw/mediawiki/jobrunner.yaml b/hieradata/codfw/mediawiki/jobrunner.yaml index 0704f69..f550b22 100644 --- a/hieradata/codfw/mediawiki/jobrunner.yaml +++ b/hieradata/codfw/mediawiki/jobrunner.yaml @@ -1,4 +1,4 @@ -queue_servers: +mediawiki::jobrunner::queue_servers: - rdb2001.codfw.wmnet:6379 - rdb2001.codfw.wmnet:6380 - rdb2001.codfw.wmnet:6381 @@ -11,9 +11,9 @@ - rdb2005.codfw.wmnet:6479 - rdb2005.codfw.wmnet:6480 - rdb2005.codfw.wmnet:6481 -aggr_servers: +mediawiki::jobrunner::aggr_servers: - rdb2001.codfw.wmnet:6378 - rdb2003.codfw.wmnet:6378 - rdb2005.codfw.wmnet:6378 # statsd is still in eqiad -statsd_server: statsd.eqiad.wmnet:8125 +mediawiki::jobrunner::statsd_server: statsd.eqiad.wmnet:8125 diff --git a/hieradata/codfw/puppetmaster/config.yaml b/hieradata/codfw/puppetmaster/config.yaml index 1d5e2a7..e2a72ba 100644 --- a/hieradata/codfw/puppetmaster/config.yaml +++ b/hieradata/codfw/puppetmaster/config.yaml @@ -1 +1 @@ -puppetdb_host: nihal.codfw.wmnet +puppetmaster::config::puppetdb_host: nihal.codfw.wmnet diff --git a/hieradata/codfw/swift.yaml b/hieradata/codfw/swift.yaml index 72e1221..b003cd7 100644 --- a/hieradata/codfw/swift.yaml +++ b/hieradata/codfw/swift.yaml @@ -1 +1 @@ -hash_path_suffix: 'de4227064232ed08' +swift::hash_path_suffix: 'de4227064232ed08' diff --git a/hieradata/codfw/swift/params.yaml b/hieradata/codfw/swift/params.yaml index a73479d..c48bbe5 100644 --- a/hieradata/codfw/swift/params.yaml +++ b/hieradata/codfw/swift/params.yaml @@ -1,5 +1,5 @@ -swift_cluster: codfw-prod -accounts: +swift::params::swift_cluster: codfw-prod +swift::params::accounts: super_admin: access: '.admin .reseller_admin' account_name: 'AUTH_admin' diff --git a/hieradata/codfw/swift/proxy.yaml
