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 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 
b/hieradata/common/base/remote_syslog.yaml
index a02ec6a..d45e2b1 100644
--- a/hieradata/common/base/remote_syslog.yaml
+++ b/hieradata/common/base/remote_syslog.yaml
@@ -1,5 +1,5 @@
 ---
-enable: true
-central_hosts:
+base::remote_syslog::enable: true
+base::remote_syslog::central_hosts:
   - syslog.eqiad.wmnet
   - syslog.codfw.wmnet
diff --git a/hieradata/common/cache/ipsec/kafka.yaml 
b/hieradata/common/cache/ipsec/kafka.yaml
index 0dd1630..53cb85c 100644
--- a/hieradata/common/cache/ipsec/kafka.yaml
+++ b/hieradata/common/cache/ipsec/kafka.yaml
@@ -1,7 +1,7 @@
 # Note: this isn't a real cache cluster, its purpose is just to integrate
 # kafka nodelists with the caches' ipsec host<->host association data, so that
 # we can do ipsec for cache<->kafka the same way we do for cache<->cache.
-nodes:
+cache::ipsec::kafka::nodes:
   eqiad:
     - 'kafka1012.eqiad.wmnet'
     - 'kafka1013.eqiad.wmnet'
diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index ea317c9..043ba56 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -1,4 +1,4 @@
-nodes:
+cache::maps::nodes:
   codfw:
     - 'cp2003.codfw.wmnet'
     - 'cp2009.codfw.wmnet'
@@ -19,7 +19,7 @@
     - 'cp4012.ulsfo.wmnet'
     - 'cp4019.ulsfo.wmnet'
     - 'cp4020.ulsfo.wmnet'
-apps:
+cache::maps::apps:
   kartotherian:
     route: 'codfw'
     backends:
diff --git a/hieradata/common/cache/misc.yaml b/hieradata/common/cache/misc.yaml
index 15a8a47..8e92a7e 100644
--- a/hieradata/common/cache/misc.yaml
+++ b/hieradata/common/cache/misc.yaml
@@ -1,4 +1,4 @@
-nodes:
+cache::misc::nodes:
   eqiad:
     - 'cp1045.eqiad.wmnet'
     - 'cp1051.eqiad.wmnet'
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 89dabbd..3e5020d 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -1,4 +1,4 @@
-nodes:
+cache::text::nodes:
   codfw:
     - 'cp2001.codfw.wmnet'
     - 'cp2004.codfw.wmnet'
@@ -33,7 +33,7 @@
     - 'cp4016.ulsfo.wmnet'
     - 'cp4017.ulsfo.wmnet'
     - 'cp4018.ulsfo.wmnet'
-apps:
+cache::text::apps:
   appservers:
     route: 'eqiad'
     backends:
diff --git a/hieradata/common/cache/upload.yaml 
b/hieradata/common/cache/upload.yaml
index 25ead0f..85d02a4 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -1,4 +1,4 @@
-nodes:
+cache::upload::nodes:
   codfw:
     - 'cp2002.codfw.wmnet'
     - 'cp2005.codfw.wmnet'
@@ -42,7 +42,7 @@
     - 'cp4013.ulsfo.wmnet'
     - 'cp4014.ulsfo.wmnet'
     - 'cp4015.ulsfo.wmnet'
-apps:
+cache::upload::apps:
   swift:
     route: 'eqiad'
     backends:
diff --git a/hieradata/common/contint.yaml b/hieradata/common/contint.yaml
index a4bef3b..865b7d3 100644
--- a/hieradata/common/contint.yaml
+++ b/hieradata/common/contint.yaml
@@ -2,11 +2,11 @@
 #
 # Use ip address since the value is injected in an iptables rule and ferm
 # @resolve has undefined behavior.
-nodepool_host: '10.64.20.18'  # labnodepool1001.eqiad.wmnet
+contint::nodepool_host: '10.64.20.18'  # labnodepool1001.eqiad.wmnet
 
 # Hosts running zuul-merger process
 #
 # Use ip addresses since the values are injected in iptables rules.
 #
-zuul_merger_hosts:
+contint::zuul_merger_hosts:
     - 10.64.4.12  # scandium.eqiad.wmnet T95046
diff --git a/hieradata/common/dataset.yaml b/hieradata/common/dataset.yaml
index 58ed136..43c768a 100644
--- a/hieradata/common/dataset.yaml
+++ b/hieradata/common/dataset.yaml
@@ -1 +1 @@
-base::monitoring::host::nrpe_check_disk_options: -w 6% -c 3% -l -e -p /
+dataset::base::monitoring::host::nrpe_check_disk_options: -w 6% -c 3% -l -e -p 
/
diff --git a/hieradata/common/discovery.yaml b/hieradata/common/discovery.yaml
index e36858d..2a4df45 100644
--- a/hieradata/common/discovery.yaml
+++ b/hieradata/common/discovery.yaml
@@ -1,7 +1,7 @@
 # Application routes
 # MediaWiki should be reached to the master datacenter,
 # while other services should be polled locally
-app_routes:
+discovery::app_routes:
   mediawiki: 'eqiad'
   parsoid: "%{::site}"
   restbase: "%{::site}"
diff --git a/hieradata/common/dnsrecursor/labsaliaser.yaml 
b/hieradata/common/dnsrecursor/labsaliaser.yaml
index 4cf8172..6fc06be 100644
--- a/hieradata/common/dnsrecursor/labsaliaser.yaml
+++ b/hieradata/common/dnsrecursor/labsaliaser.yaml
@@ -1,7 +1,7 @@
 # Extra records that the Labs DNS resolver should respond to.
 # Used for things that would ideally be in a .svc. DNS zone but
 # we do not have one. REMEMBER THE TRAILING DOT.
-extra_records:
+dnsrecursor::labsaliaser::extra_records:
   tools-db.tools.eqiad.wmflabs.: 10.64.37.9 # labsdb1005.eqiad.wmnet / tools-db
   tools-redis.tools.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
   tools-redis.eqiad.wmflabs.: 10.68.22.56 # 
tools-redis-1001.tools.eqiad.wmflabs
\ No newline at end of file
diff --git a/hieradata/common/lvs/configuration.yaml 
b/hieradata/common/lvs/configuration.yaml
index 2273f8c..20560fa 100644
--- a/hieradata/common/lvs/configuration.yaml
+++ b/hieradata/common/lvs/configuration.yaml
@@ -1,4 +1,4 @@
-lvs_service_ips:
+lvs::configuration::lvs_service_ips:
   text: &ip_block001
     codfw:
       textlb: 208.80.153.224
@@ -129,7 +129,7 @@
   wdqs: &ip_block031
     eqiad: 10.2.2.32
     codfw: 10.2.1.32
-lvs_services:
+lvs::configuration::lvs_services:
   text:
     description: "Main wiki platform LVS service, text.%{::site}.wikimedia.org 
(Varnish)"
     class: high-traffic1
diff --git a/hieradata/common/mediawiki.yaml b/hieradata/common/mediawiki.yaml
index d1b5ef5..7016460 100644
--- a/hieradata/common/mediawiki.yaml
+++ b/hieradata/common/mediawiki.yaml
@@ -1,3 +1,3 @@
 # TODO: setup something to loadbalance the logstash hosts rather than relying
 # on a single node in the cluster.
-forward_syslog: "logstash1001.eqiad.wmnet:10514"
+mediawiki::forward_syslog: "logstash1001.eqiad.wmnet:10514"
diff --git a/hieradata/common/mediawiki/redis_servers.yaml 
b/hieradata/common/mediawiki/redis_servers.yaml
index cdba5c3..867c427 100644
--- a/hieradata/common/mediawiki/redis_servers.yaml
+++ b/hieradata/common/mediawiki/redis_servers.yaml
@@ -1,4 +1,4 @@
-eqiad:
+mediawiki::redis_servers::eqiad:
   shard01:
     host: 10.64.0.180
     port: 6379
@@ -55,7 +55,7 @@
     port: 6379
 
 
-codfw:
+mediawiki::redis_servers::codfw:
   shard01:
     host: 10.192.0.34
     port: 6379
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index e734c8f..deaabb7 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -1,7 +1,7 @@
 ---
 # This is a yaml file. Remember to keep indentation otherwise the structure
 # will not be what you intend
-groups:
+monitoring::groups:
   analytics_eqiad:
     description: analytics servers in eqiad
 
diff --git a/hieradata/common/network.yaml b/hieradata/common/network.yaml
index 6a80c16..e0681a9 100644
--- a/hieradata/common/network.yaml
+++ b/hieradata/common/network.yaml
@@ -1,4 +1,4 @@
-subnets:
+network::subnets:
   production:
     eqiad:
       public:
diff --git a/hieradata/common/nrpe.yaml b/hieradata/common/nrpe.yaml
index 4623070..f9b6ba5 100644
--- a/hieradata/common/nrpe.yaml
+++ b/hieradata/common/nrpe.yaml
@@ -1 +1 @@
-allowed_hosts: '127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14'
+nrpe::allowed_hosts: '127.0.0.1,208.80.152.185,208.80.152.161,208.80.154.14'
diff --git a/hieradata/common/ocg.yaml b/hieradata/common/ocg.yaml
index 9a3dc8f..873eaa4 100644
--- a/hieradata/common/ocg.yaml
+++ b/hieradata/common/ocg.yaml
@@ -1,4 +1,4 @@
-temp_dir: "/mnt/tmpfs"
-redis_host: "rdb1007.eqiad.wmnet"
-statsd_host: "statsd.eqiad.wmnet"
-graylog_host: "logstash1002.eqiad.wmnet"
+ocg::temp_dir: "/mnt/tmpfs"
+ocg::redis_host: "rdb1007.eqiad.wmnet"
+ocg::statsd_host: "statsd.eqiad.wmnet"
+ocg::graylog_host: "logstash1002.eqiad.wmnet"
diff --git a/hieradata/common/ocg/ganglia.yaml 
b/hieradata/common/ocg/ganglia.yaml
index 9b2a640..961f7d2 100644
--- a/hieradata/common/ocg/ganglia.yaml
+++ b/hieradata/common/ocg/ganglia.yaml
@@ -1 +1 @@
-data_filesystem: "/srv"
+ocg::ganglia::data_filesystem: "/srv"
diff --git a/hieradata/common/openstack.yaml b/hieradata/common/openstack.yaml
index 72d7bd8..22b71fd 100644
--- a/hieradata/common/openstack.yaml
+++ b/hieradata/common/openstack.yaml
@@ -1 +1 @@
-version: 'liberty'
+openstack::version: 'liberty'
diff --git a/hieradata/common/puppetmaster.yaml 
b/hieradata/common/puppetmaster.yaml
index 83dcc94..a7a0d04 100644
--- a/hieradata/common/puppetmaster.yaml
+++ b/hieradata/common/puppetmaster.yaml
@@ -1,4 +1,4 @@
-servers:
+puppetmaster::servers:
   puppetmaster1001.eqiad.wmnet:
     - { worker: puppetmaster1001.eqiad.wmnet, loadfactor: 10 }
     - { worker: puppetmaster1002.eqiad.wmnet, loadfactor: 20 }
@@ -6,4 +6,4 @@
   puppetmaster2001.codfw.wmnet:
     - { worker: puppetmaster2001.codfw.wmnet, loadfactor: 10 }
     - { worker: puppetmaster2002.codfw.wmnet, loadfactor: 20 }
-ca_server: puppetmaster1001.eqiad.wmnet
+puppetmaster::ca_server: puppetmaster1001.eqiad.wmnet
diff --git a/hieradata/common/puppetmaster/config.yaml 
b/hieradata/common/puppetmaster/config.yaml
index fdd2ff4..7b39652 100644
--- a/hieradata/common/puppetmaster/config.yaml
+++ b/hieradata/common/puppetmaster/config.yaml
@@ -1 +1 @@
-use_puppetdb: true
+puppetmaster::config::use_puppetdb: true
diff --git a/hieradata/common/puppetmaster/puppetdb.yaml 
b/hieradata/common/puppetmaster/puppetdb.yaml
index 973588f..4de1c15 100644
--- a/hieradata/common/puppetmaster/puppetdb.yaml
+++ b/hieradata/common/puppetmaster/puppetdb.yaml
@@ -1,4 +1,4 @@
-postgres_users:
+puppetmaster::puppetdb::postgres_users:
   replication@nihal-v4:
     user: replication
     database: all
@@ -10,5 +10,5 @@
     database: puppetdb
     password: "%{::puppetmaster::puppetdb::database::puppetdb_pass}"
     cidr: 10.192.16.184/32
-master: nitrogen.eqiad.wmnet
-slaves: [nihal.codfw.wmnet]
+puppetmaster::puppetdb::master: nitrogen.eqiad.wmnet
+puppetmaster::puppetdb::slaves: [nihal.codfw.wmnet]
diff --git a/hieradata/common/role/cache/2layer.yaml 
b/hieradata/common/role/cache/2layer.yaml
index 06dd456..45c2ece 100644
--- a/hieradata/common/role/cache/2layer.yaml
+++ b/hieradata/common/role/cache/2layer.yaml
@@ -1,3 +1,3 @@
-storage_parts:
+role::cache::2layer::storage_parts:
   - sda3
   - sdb3
diff --git a/hieradata/common/role/deployment.yaml 
b/hieradata/common/role/deployment.yaml
index 0e037aa..03c6b9a 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -1,4 +1,4 @@
-repo_config:
+role::deployment::repo_config:
   integration/mediawiki-tools-codesniffer:
     upstream: https://gerrit.wikimedia.org/r/mediawiki/tools/codesniffer
   integration/phpunit:
diff --git a/hieradata/common/scap.yaml b/hieradata/common/scap.yaml
index a41aeb8..edff342 100644
--- a/hieradata/common/scap.yaml
+++ b/hieradata/common/scap.yaml
@@ -1,2 +1,2 @@
 # scap3 (git-based) deployment server
-deployment_server: "deployment.eqiad.wmnet"
+scap::deployment_server: "deployment.eqiad.wmnet"
diff --git a/hieradata/common/scap/dsh.yaml b/hieradata/common/scap/dsh.yaml
index 7c965eb..385a600 100644
--- a/hieradata/common/scap/dsh.yaml
+++ b/hieradata/common/scap/dsh.yaml
@@ -1,6 +1,6 @@
 # Scap proxy list
 #
-scap_proxies:
+scap::dsh::scap_proxies:
   - "mw1280.eqiad.wmnet" # A7 eqiad
   - "mw1211.eqiad.wmnet" # B7 eqiad
   - "mw1216.eqiad.wmnet" # B8 eqiad
@@ -12,11 +12,11 @@
   - "mw2187.codfw.wmnet" # C4 codfw
   - "mw2215.codfw.wmnet" # A3 codfw
 
-scap_masters:
+scap::dsh::scap_masters:
   - "tin.eqiad.wmnet"
   - "mira.codfw.wmnet"
 
-groups:
+scap::dsh::groups:
   mediawiki-installation:
     conftool:
       - {'cluster': 'appserver', 'service': 'apache2'}
diff --git a/hieradata/common/service/configuration.yaml 
b/hieradata/common/service/configuration.yaml
index 8dd9f1f..3703c5f 100644
--- a/hieradata/common/service/configuration.yaml
+++ b/hieradata/common/service/configuration.yaml
@@ -1,3 +1,3 @@
-http_proxy: "http://url-downloader.%{::site}.wikimedia.org:8080";
-statsd_host: statsd.eqiad.wmnet # statsd is (still) eqiad-only
-logstash_host: logstash1001.eqiad.wmnet # logstash is (still) eqiad-only
+service::configuration::http_proxy: 
"http://url-downloader.%{::site}.wikimedia.org:8080";
+service::configuration::statsd_host: statsd.eqiad.wmnet # statsd is (still) 
eqiad-only
+service::configuration::logstash_host: logstash1001.eqiad.wmnet # logstash is 
(still) eqiad-only
diff --git a/hieradata/common/statsite/instance.yaml 
b/hieradata/common/statsite/instance.yaml
index 08ae28a..266552d 100644
--- a/hieradata/common/statsite/instance.yaml
+++ b/hieradata/common/statsite/instance.yaml
@@ -1 +1 @@
-graphite_host: 'graphite-in.eqiad.wmnet'
+statsite::instance::graphite_host: 'graphite-in.eqiad.wmnet'
diff --git a/hieradata/common/swift.yaml b/hieradata/common/swift.yaml
index 1921c04..482b9b4 100644
--- a/hieradata/common/swift.yaml
+++ b/hieradata/common/swift.yaml
@@ -1,5 +1,5 @@
 # used by ferm
-proxyhosts:
+swift::proxyhosts:
   - ms-fe1001.eqiad.wmnet
   - ms-fe1002.eqiad.wmnet
   - ms-fe1003.eqiad.wmnet
@@ -11,7 +11,7 @@
   - ms-fe3001.esams.wmnet
   - ms-fe3002.esams.wmnet
 
-storagehosts:
+swift::storagehosts:
   - ms-be1001.eqiad.wmnet
   - ms-be1002.eqiad.wmnet
   - ms-be1003.eqiad.wmnet
diff --git a/hieradata/common/swift/params.yaml 
b/hieradata/common/swift/params.yaml
index 94ad6cd..939a2fd 100644
--- a/hieradata/common/swift/params.yaml
+++ b/hieradata/common/swift/params.yaml
@@ -2,7 +2,7 @@
 # container-sync-realms.conf.
 # See also
 # http://docs.openstack.org/developer/swift/overview_container_sync.html
-replication_accounts:
+swift::params::replication_accounts:
     mw_media:
         cluster_codfw: 'http://ms-fe.svc.codfw.wmnet/v1/'
 
diff --git a/hieradata/common/swift/proxy.yaml 
b/hieradata/common/swift/proxy.yaml
index 98b8e81..b606ca3 100644
--- a/hieradata/common/swift/proxy.yaml
+++ b/hieradata/common/swift/proxy.yaml
@@ -1,9 +1,9 @@
-statsd_host: 'localhost'
-backend_url_format: 'sitelang'
-rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
-dispersion_account: 'dispersion'
-rewrite_account: 'mw_media'
-shard_container_list: [
+swift::proxy::statsd_host: 'localhost'
+swift::proxy::backend_url_format: 'sitelang'
+swift::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
+swift::proxy::dispersion_account: 'dispersion'
+swift::proxy::rewrite_account: 'mw_media'
+swift::proxy::shard_container_list: [
   'global-data-math-render',
 
   'wikipedia-commons-local-public', 'wikipedia-commons-local-temp',
@@ -56,7 +56,7 @@
 # no trailing comma!
  ]
 
-thumbor_wiki_list: [
+swift::proxy::thumbor_wiki_list: [
   'wikimedia-commons',
   'wikipedia-en', 'wikipedia-ja', 'wikipedia-de', 'wikipedia-ru',
   'wikipedia-it', 'wikipedia-pt', 'wikipedia-he', 'wikipedia-fr',
diff --git a/hieradata/common/swift/storage.yaml 
b/hieradata/common/swift/storage.yaml
index 3596100..2c6160b 100644
--- a/hieradata/common/swift/storage.yaml
+++ b/hieradata/common/swift/storage.yaml
@@ -1 +1 @@
-statsd_host: 'localhost'
+swift::storage::statsd_host: 'localhost'
diff --git a/hieradata/common/zookeeper.yaml b/hieradata/common/zookeeper.yaml
index 9b9a9e0..391dfe6 100644
--- a/hieradata/common/zookeeper.yaml
+++ b/hieradata/common/zookeeper.yaml
@@ -1,7 +1,7 @@
 # Max number of connections per IP for Zookeeper
-max_client_connections: 1024
+zookeeper::max_client_connections: 1024
 
 # Default tick_time is 2000ms, this should allow a max
 # of 16 seconds of latency for Zookeeper client sessions.
 # See comments in role::kafka::analytics::broker for more info.
-sync_limit: 8
+zookeeper::sync_limit: 8
diff --git a/hieradata/esams/swift.yaml b/hieradata/esams/swift.yaml
index 6d71bf9..a352660 100644
--- a/hieradata/esams/swift.yaml
+++ b/hieradata/esams/swift.yaml
@@ -1 +1 @@
-hash_path_suffix: 'a0af6563d361f968'
+swift::hash_path_suffix: 'a0af6563d361f968'
diff --git a/hieradata/esams/swift/params.yaml 
b/hieradata/esams/swift/params.yaml
index 78eac0b..e70fee4 100644
--- a/hieradata/esams/swift/params.yaml
+++ b/hieradata/esams/swift/params.yaml
@@ -1,5 +1,5 @@
-swift_cluster: esams-prod
-accounts:
+swift::params::swift_cluster: esams-prod
+swift::params::accounts:
     super_admin:
         access:       '.admin .reseller_admin'
         account_name: 'AUTH_admin'
diff --git a/hieradata/esams/swift/proxy.yaml b/hieradata/esams/swift/proxy.yaml
index c89a8de..eb7ef99 100644
--- a/hieradata/esams/swift/proxy.yaml
+++ b/hieradata/esams/swift/proxy.yaml
@@ -1,5 +1,5 @@
-proxy_service_host: 'ms-fe.svc.esams.wmnet'
-memcached_servers: [
+swift::proxy::proxy_service_host: 'ms-fe.svc.esams.wmnet'
+swift::proxy::memcached_servers: [
   'ms-fe3001.esams.wmnet:11211',
   'ms-fe3002.esams.wmnet:11211'
 # no trailing comma!

-- 
To view, visit https://gerrit.wikimedia.org/r/315200
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79c0e7880a30ceca10825730fbebca7d49e11bfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to