Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402347 )
Change subject: hiera: first step of simplification
......................................................................
hiera: first step of simplification
In an effort to simplify our hiera backends before migrating to hiera 5,
do as follows:
- Remove the role backend from the list of backends
- Add the role/{common,$site} paths to the hierarchy for nuyaml
- While we're at it, simplify the directory structure (which was
somewhat convoluted and caused confusion) for the role hiera directories.
Change-Id: If10176ac3dd0f32408a0ccd3b539a29843bdcf8f
---
R hieradata/role/codfw/cache::misc.yaml
R hieradata/role/codfw/cache::text.yaml
R hieradata/role/codfw/cache::upload.yaml
R hieradata/role/codfw/elasticsearch::cirrus.yaml
R hieradata/role/codfw/graphite::production.yaml
R hieradata/role/codfw/kubernetes::master.yaml
R hieradata/role/codfw/kubernetes::worker.yaml
R hieradata/role/codfw/lvs::balancer.yaml
R hieradata/role/codfw/maps::master.yaml
R hieradata/role/codfw/maps::slave.yaml
R hieradata/role/codfw/maps::test::master.yaml
R hieradata/role/codfw/maps::test::slave.yaml
R hieradata/role/codfw/maps::test::vectortiles_master.yaml
R hieradata/role/codfw/mediawiki::canary_appserver.yaml
R hieradata/role/codfw/ores::redis.yaml
R hieradata/role/codfw/parsoid::production.yaml
R hieradata/role/codfw/prometheus::ops.yaml
R hieradata/role/codfw/puppetmaster::backend.yaml
R hieradata/role/codfw/puppetmaster::frontend.yaml
R hieradata/role/codfw/restbase::production.yaml
R hieradata/role/codfw/restbase::test_cluster.yaml
R hieradata/role/codfw/swift::proxy.yaml
R hieradata/role/codfw/swift::storage.yaml
R hieradata/role/codfw/thumbor::mediawiki.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::control.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::net.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::puppetmaster::frontend.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::services.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::virt.yaml
R hieradata/role/codfw/wmcs::openstack::labtest::web.yaml
R hieradata/role/common/analytics_cluster::coordinator.yaml
R hieradata/role/common/analytics_cluster::hadoop::master.yaml
R hieradata/role/common/analytics_cluster::hadoop::standby.yaml
R hieradata/role/common/analytics_cluster::hadoop::worker.yaml
R hieradata/role/common/analytics_cluster::hue.yaml
R hieradata/role/common/analytics_cluster::webserver.yaml
R hieradata/role/common/bastionhost::general.yaml
R hieradata/role/common/bastionhost::pop.yaml
R hieradata/role/common/cache::canary.yaml
R hieradata/role/common/cache::misc.yaml
R hieradata/role/common/cache::text.yaml
R hieradata/role/common/cache::upload.yaml
R hieradata/role/common/ci::master.yaml
R hieradata/role/common/cluster::management.yaml
R hieradata/role/common/docker::registry.yaml
R hieradata/role/common/druid::analytics::worker.yaml
R hieradata/role/common/druid::public::worker.yaml
D hieradata/role/common/dumps/generation/worker/dumper.yaml
C hieradata/role/common/dumps::generation::worker::dumper.yaml
R hieradata/role/common/dumps::generation::worker::dumper_misc.yaml
R hieradata/role/common/dumps::generation::worker::testbed.yaml
R hieradata/role/common/dumps::web::htmldumps.yaml
R hieradata/role/common/elasticsearch::cirrus.yaml
R hieradata/role/common/elasticsearch::relforge.yaml
R hieradata/role/common/etcd::kubernetes.yaml
R hieradata/role/common/etcd::networking.yaml
R hieradata/role/common/eventbus::eventbus.yaml
R hieradata/role/common/eventlogging::analytics.yaml
R hieradata/role/common/graphite::production.yaml
R hieradata/role/common/installserver::dhcp.yaml
R hieradata/role/common/jobqueue_redis::master.yaml
R hieradata/role/common/jobqueue_redis::slave.yaml
R hieradata/role/common/kafka::analytics::broker.yaml
R hieradata/role/common/kafka::analytics::burrow.yaml
R hieradata/role/common/kafka::jumbo::broker.yaml
R hieradata/role/common/kubernetes::master.yaml
R hieradata/role/common/kubernetes::staging::etcd.yaml
R hieradata/role/common/kubernetes::staging::master.yaml
R hieradata/role/common/kubernetes::staging::worker.yaml
R hieradata/role/common/kubernetes::worker.yaml
R hieradata/role/common/labs::db::replica.yaml
R hieradata/role/common/labs::nfs::backup.yaml
R hieradata/role/common/labs::nfs::misc.yaml
R hieradata/role/common/labs::nfs::primary.yaml
R hieradata/role/common/labs::nfs::secondary.yaml
R hieradata/role/common/labs::openstack::nova::api.yaml
R hieradata/role/common/labs::openstack::nova::compute.yaml
R hieradata/role/common/labs::openstack::nova::controller.yaml
R hieradata/role/common/labs::prometheus.yaml
R hieradata/role/common/labs::puppetmaster.yaml
R hieradata/role/common/logging::mediawiki::udp2log.yaml
R hieradata/role/common/logstash::apifeatureusage.yaml
R hieradata/role/common/logstash::collector.yaml
R hieradata/role/common/logstash::elasticsearch.yaml
R hieradata/role/common/lvs::balancer.yaml
R hieradata/role/common/mail::mx.yaml
R hieradata/role/common/maps::master.yaml
R hieradata/role/common/maps::slave.yaml
R hieradata/role/common/maps::test::master.yaml
R hieradata/role/common/maps::test::slave.yaml
R hieradata/role/common/maps::test::vectortiles_master.yaml
R hieradata/role/common/mariadb::analytics.yaml
R hieradata/role/common/mariadb::client.yaml
R hieradata/role/common/mariadb::core.yaml
R hieradata/role/common/mariadb::dbstore.yaml
R hieradata/role/common/mariadb::dbstore_multiinstance.yaml
R hieradata/role/common/mariadb::labs_deprecated.yaml
R hieradata/role/common/mariadb::misc.yaml
R hieradata/role/common/mariadb::misc::eventlogging::master.yaml
R hieradata/role/common/mariadb::misc::eventlogging::replica.yaml
R hieradata/role/common/mariadb::misc::eventlogging::replica_config.yaml
R hieradata/role/common/mariadb::misc::phabricator.yaml
R hieradata/role/common/mariadb::otrsbackups.yaml
R hieradata/role/common/mariadb::parsercache.yaml
R hieradata/role/common/mariadb::sanitarium_multiinstance.yaml
R hieradata/role/common/mariadb::sanitarium_multisource.yaml
R hieradata/role/common/mariadb::tendril.yaml
R hieradata/role/common/mediawiki::appserver.yaml
R hieradata/role/common/mediawiki::appserver::api.yaml
R hieradata/role/common/mediawiki::appserver::canary_api.yaml
R hieradata/role/common/mediawiki::canary_appserver.yaml
R hieradata/role/common/mediawiki::imagescaler.yaml
R hieradata/role/common/mediawiki::jobrunner.yaml
R hieradata/role/common/mediawiki::memcached.yaml
R hieradata/role/common/mediawiki::videoscaler.yaml
R hieradata/role/common/ores::redis.yaml
R hieradata/role/common/ores::stresstest.yaml
R hieradata/role/common/osm::master.yaml
R hieradata/role/common/osm::slave.yaml
R hieradata/role/common/parsoid::production.yaml
R hieradata/role/common/parsoid::testing.yaml
R hieradata/role/common/paws_internal::jupyterhub.yaml
R hieradata/role/common/piwik::server.yaml
R hieradata/role/common/prometheus::ops.yaml
R hieradata/role/common/puppetmaster::backend.yaml
R hieradata/role/common/puppetmaster::frontend.yaml
R hieradata/role/common/restbase::dev_cluster.yaml
R hieradata/role/common/restbase::production.yaml
R hieradata/role/common/restbase::production_ng.yaml
R hieradata/role/common/restbase::test_cluster.yaml
R hieradata/role/common/snapshot::dumper.yaml
R hieradata/role/common/snapshot::producer.yaml
R hieradata/role/common/spare::system.yaml
R hieradata/role/common/statistics::cruncher.yaml
R hieradata/role/common/statistics::explorer.yaml
R hieradata/role/common/statistics::private.yaml
R hieradata/role/common/striker::web.yaml
R hieradata/role/common/swift::proxy.yaml
R hieradata/role/common/swift::storage.yaml
R hieradata/role/common/syslog::centralserver.yaml
R hieradata/role/common/thumbor::mediawiki.yaml
R hieradata/role/common/xhgui::app.yaml
R hieradata/role/eqiad/cache::misc.yaml
R hieradata/role/eqiad/cache::text.yaml
R hieradata/role/eqiad/cache::upload.yaml
R hieradata/role/eqiad/druid::public::worker.yaml
R hieradata/role/eqiad/elasticsearch::cirrus.yaml
R hieradata/role/eqiad/elasticsearch::relforge.yaml
R hieradata/role/eqiad/graphite::production.yaml
R hieradata/role/eqiad/kubernetes::master.yaml
R hieradata/role/eqiad/kubernetes::worker.yaml
R hieradata/role/eqiad/labs::openstack::nova::network.yaml
R hieradata/role/eqiad/labs::puppetmaster.yaml
R hieradata/role/eqiad/lvs::balancer.yaml
R hieradata/role/eqiad/maps::master.yaml
R hieradata/role/eqiad/maps::slave.yaml
R hieradata/role/eqiad/mediawiki::jobrunner.yaml
R hieradata/role/eqiad/ores::redis.yaml
R hieradata/role/eqiad/parsoid::production.yaml
R hieradata/role/eqiad/prometheus::ops.yaml
R hieradata/role/eqiad/puppetmaster::backend.yaml
R hieradata/role/eqiad/puppetmaster::frontend.yaml
R hieradata/role/eqiad/restbase::production.yaml
R hieradata/role/eqiad/restbase::test_cluster.yaml
R hieradata/role/eqiad/swift::proxy.yaml
R hieradata/role/eqiad/swift::storage.yaml
R hieradata/role/eqiad/thumbor::mediawiki.yaml
R hieradata/role/eqiad/wmcs::openstack::main::control.yaml
R hieradata/role/eqiad/wmcs::openstack::main::net.yaml
R hieradata/role/eqiad/wmcs::openstack::main::net_standby.yaml
R hieradata/role/eqiad/wmcs::openstack::main::nodepool.yaml
R hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::backend.yaml
R hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::frontend.yaml
R hieradata/role/eqiad/wmcs::openstack::main::services_primary.yaml
R hieradata/role/eqiad/wmcs::openstack::main::services_secondary.yaml
R hieradata/role/eqiad/wmcs::openstack::main::virt.yaml
R hieradata/role/eqiad/wmcs::openstack::main::wikitech.yaml
R hieradata/role/esams/cache::misc.yaml
R hieradata/role/esams/cache::text.yaml
R hieradata/role/esams/cache::upload.yaml
R hieradata/role/esams/lvs::balancer.yaml
R hieradata/role/esams/swift::proxy.yaml
R hieradata/role/esams/swift::storage.yaml
R hieradata/role/ulsfo/cache::misc.yaml
R hieradata/role/ulsfo/cache::text.yaml
R hieradata/role/ulsfo/cache::upload.yaml
R hieradata/role/ulsfo/lvs::balancer.yaml
M modules/puppetmaster/files/production.hiera.yaml
188 files changed, 6 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/402347/1
diff --git a/hieradata/role/codfw/cache/misc.yaml
b/hieradata/role/codfw/cache::misc.yaml
similarity index 100%
rename from hieradata/role/codfw/cache/misc.yaml
rename to hieradata/role/codfw/cache::misc.yaml
diff --git a/hieradata/role/codfw/cache/text.yaml
b/hieradata/role/codfw/cache::text.yaml
similarity index 100%
rename from hieradata/role/codfw/cache/text.yaml
rename to hieradata/role/codfw/cache::text.yaml
diff --git a/hieradata/role/codfw/cache/upload.yaml
b/hieradata/role/codfw/cache::upload.yaml
similarity index 100%
rename from hieradata/role/codfw/cache/upload.yaml
rename to hieradata/role/codfw/cache::upload.yaml
diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml
b/hieradata/role/codfw/elasticsearch::cirrus.yaml
similarity index 100%
rename from hieradata/role/codfw/elasticsearch/cirrus.yaml
rename to hieradata/role/codfw/elasticsearch::cirrus.yaml
diff --git a/hieradata/role/codfw/graphite/production.yaml
b/hieradata/role/codfw/graphite::production.yaml
similarity index 100%
rename from hieradata/role/codfw/graphite/production.yaml
rename to hieradata/role/codfw/graphite::production.yaml
diff --git a/hieradata/role/codfw/kubernetes/master.yaml
b/hieradata/role/codfw/kubernetes::master.yaml
similarity index 100%
rename from hieradata/role/codfw/kubernetes/master.yaml
rename to hieradata/role/codfw/kubernetes::master.yaml
diff --git a/hieradata/role/codfw/kubernetes/worker.yaml
b/hieradata/role/codfw/kubernetes::worker.yaml
similarity index 100%
rename from hieradata/role/codfw/kubernetes/worker.yaml
rename to hieradata/role/codfw/kubernetes::worker.yaml
diff --git a/hieradata/role/codfw/lvs/balancer.yaml
b/hieradata/role/codfw/lvs::balancer.yaml
similarity index 100%
rename from hieradata/role/codfw/lvs/balancer.yaml
rename to hieradata/role/codfw/lvs::balancer.yaml
diff --git a/hieradata/role/codfw/maps/master.yaml
b/hieradata/role/codfw/maps::master.yaml
similarity index 100%
rename from hieradata/role/codfw/maps/master.yaml
rename to hieradata/role/codfw/maps::master.yaml
diff --git a/hieradata/role/codfw/maps/slave.yaml
b/hieradata/role/codfw/maps::slave.yaml
similarity index 100%
rename from hieradata/role/codfw/maps/slave.yaml
rename to hieradata/role/codfw/maps::slave.yaml
diff --git a/hieradata/role/codfw/maps/test/master.yaml
b/hieradata/role/codfw/maps::test::master.yaml
similarity index 100%
rename from hieradata/role/codfw/maps/test/master.yaml
rename to hieradata/role/codfw/maps::test::master.yaml
diff --git a/hieradata/role/codfw/maps/test/slave.yaml
b/hieradata/role/codfw/maps::test::slave.yaml
similarity index 100%
rename from hieradata/role/codfw/maps/test/slave.yaml
rename to hieradata/role/codfw/maps::test::slave.yaml
diff --git a/hieradata/role/codfw/maps/test/vectortiles_master.yaml
b/hieradata/role/codfw/maps::test::vectortiles_master.yaml
similarity index 100%
rename from hieradata/role/codfw/maps/test/vectortiles_master.yaml
rename to hieradata/role/codfw/maps::test::vectortiles_master.yaml
diff --git a/hieradata/role/codfw/mediawiki/canary_appserver.yaml
b/hieradata/role/codfw/mediawiki::canary_appserver.yaml
similarity index 100%
rename from hieradata/role/codfw/mediawiki/canary_appserver.yaml
rename to hieradata/role/codfw/mediawiki::canary_appserver.yaml
diff --git a/hieradata/role/codfw/ores/redis.yaml
b/hieradata/role/codfw/ores::redis.yaml
similarity index 100%
rename from hieradata/role/codfw/ores/redis.yaml
rename to hieradata/role/codfw/ores::redis.yaml
diff --git a/hieradata/role/codfw/parsoid/production.yaml
b/hieradata/role/codfw/parsoid::production.yaml
similarity index 100%
rename from hieradata/role/codfw/parsoid/production.yaml
rename to hieradata/role/codfw/parsoid::production.yaml
diff --git a/hieradata/role/codfw/prometheus/ops.yaml
b/hieradata/role/codfw/prometheus::ops.yaml
similarity index 100%
rename from hieradata/role/codfw/prometheus/ops.yaml
rename to hieradata/role/codfw/prometheus::ops.yaml
diff --git a/hieradata/role/codfw/puppetmaster/backend.yaml
b/hieradata/role/codfw/puppetmaster::backend.yaml
similarity index 100%
rename from hieradata/role/codfw/puppetmaster/backend.yaml
rename to hieradata/role/codfw/puppetmaster::backend.yaml
diff --git a/hieradata/role/codfw/puppetmaster/frontend.yaml
b/hieradata/role/codfw/puppetmaster::frontend.yaml
similarity index 100%
rename from hieradata/role/codfw/puppetmaster/frontend.yaml
rename to hieradata/role/codfw/puppetmaster::frontend.yaml
diff --git a/hieradata/role/codfw/restbase/production.yaml
b/hieradata/role/codfw/restbase::production.yaml
similarity index 100%
rename from hieradata/role/codfw/restbase/production.yaml
rename to hieradata/role/codfw/restbase::production.yaml
diff --git a/hieradata/role/codfw/restbase/test_cluster.yaml
b/hieradata/role/codfw/restbase::test_cluster.yaml
similarity index 100%
rename from hieradata/role/codfw/restbase/test_cluster.yaml
rename to hieradata/role/codfw/restbase::test_cluster.yaml
diff --git a/hieradata/role/codfw/swift/proxy.yaml
b/hieradata/role/codfw/swift::proxy.yaml
similarity index 100%
rename from hieradata/role/codfw/swift/proxy.yaml
rename to hieradata/role/codfw/swift::proxy.yaml
diff --git a/hieradata/role/codfw/swift/storage.yaml
b/hieradata/role/codfw/swift::storage.yaml
similarity index 100%
rename from hieradata/role/codfw/swift/storage.yaml
rename to hieradata/role/codfw/swift::storage.yaml
diff --git a/hieradata/role/codfw/thumbor/mediawiki.yaml
b/hieradata/role/codfw/thumbor::mediawiki.yaml
similarity index 100%
rename from hieradata/role/codfw/thumbor/mediawiki.yaml
rename to hieradata/role/codfw/thumbor::mediawiki.yaml
diff --git a/hieradata/role/codfw/wmcs/openstack/labtest/control.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::control.yaml
similarity index 100%
rename from hieradata/role/codfw/wmcs/openstack/labtest/control.yaml
rename to hieradata/role/codfw/wmcs::openstack::labtest::control.yaml
diff --git a/hieradata/role/codfw/wmcs/openstack/labtest/net.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::net.yaml
similarity index 100%
rename from hieradata/role/codfw/wmcs/openstack/labtest/net.yaml
rename to hieradata/role/codfw/wmcs::openstack::labtest::net.yaml
diff --git
a/hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::puppetmaster::frontend.yaml
similarity index 100%
rename from
hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
rename to
hieradata/role/codfw/wmcs::openstack::labtest::puppetmaster::frontend.yaml
diff --git a/hieradata/role/codfw/wmcs/openstack/labtest/services.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::services.yaml
similarity index 100%
rename from hieradata/role/codfw/wmcs/openstack/labtest/services.yaml
rename to hieradata/role/codfw/wmcs::openstack::labtest::services.yaml
diff --git a/hieradata/role/codfw/wmcs/openstack/labtest/virt.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::virt.yaml
similarity index 100%
rename from hieradata/role/codfw/wmcs/openstack/labtest/virt.yaml
rename to hieradata/role/codfw/wmcs::openstack::labtest::virt.yaml
diff --git a/hieradata/role/codfw/wmcs/openstack/labtest/web.yaml
b/hieradata/role/codfw/wmcs::openstack::labtest::web.yaml
similarity index 100%
rename from hieradata/role/codfw/wmcs/openstack/labtest/web.yaml
rename to hieradata/role/codfw/wmcs::openstack::labtest::web.yaml
diff --git a/hieradata/role/common/analytics_cluster/coordinator.yaml
b/hieradata/role/common/analytics_cluster::coordinator.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/coordinator.yaml
rename to hieradata/role/common/analytics_cluster::coordinator.yaml
diff --git a/hieradata/role/common/analytics_cluster/hadoop/master.yaml
b/hieradata/role/common/analytics_cluster::hadoop::master.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/hadoop/master.yaml
rename to hieradata/role/common/analytics_cluster::hadoop::master.yaml
diff --git a/hieradata/role/common/analytics_cluster/hadoop/standby.yaml
b/hieradata/role/common/analytics_cluster::hadoop::standby.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/hadoop/standby.yaml
rename to hieradata/role/common/analytics_cluster::hadoop::standby.yaml
diff --git a/hieradata/role/common/analytics_cluster/hadoop/worker.yaml
b/hieradata/role/common/analytics_cluster::hadoop::worker.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/hadoop/worker.yaml
rename to hieradata/role/common/analytics_cluster::hadoop::worker.yaml
diff --git a/hieradata/role/common/analytics_cluster/hue.yaml
b/hieradata/role/common/analytics_cluster::hue.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/hue.yaml
rename to hieradata/role/common/analytics_cluster::hue.yaml
diff --git a/hieradata/role/common/analytics_cluster/webserver.yaml
b/hieradata/role/common/analytics_cluster::webserver.yaml
similarity index 100%
rename from hieradata/role/common/analytics_cluster/webserver.yaml
rename to hieradata/role/common/analytics_cluster::webserver.yaml
diff --git a/hieradata/role/common/bastionhost/general.yaml
b/hieradata/role/common/bastionhost::general.yaml
similarity index 100%
rename from hieradata/role/common/bastionhost/general.yaml
rename to hieradata/role/common/bastionhost::general.yaml
diff --git a/hieradata/role/common/bastionhost/pop.yaml
b/hieradata/role/common/bastionhost::pop.yaml
similarity index 100%
rename from hieradata/role/common/bastionhost/pop.yaml
rename to hieradata/role/common/bastionhost::pop.yaml
diff --git a/hieradata/role/common/cache/canary.yaml
b/hieradata/role/common/cache::canary.yaml
similarity index 100%
rename from hieradata/role/common/cache/canary.yaml
rename to hieradata/role/common/cache::canary.yaml
diff --git a/hieradata/role/common/cache/misc.yaml
b/hieradata/role/common/cache::misc.yaml
similarity index 100%
rename from hieradata/role/common/cache/misc.yaml
rename to hieradata/role/common/cache::misc.yaml
diff --git a/hieradata/role/common/cache/text.yaml
b/hieradata/role/common/cache::text.yaml
similarity index 100%
rename from hieradata/role/common/cache/text.yaml
rename to hieradata/role/common/cache::text.yaml
diff --git a/hieradata/role/common/cache/upload.yaml
b/hieradata/role/common/cache::upload.yaml
similarity index 100%
rename from hieradata/role/common/cache/upload.yaml
rename to hieradata/role/common/cache::upload.yaml
diff --git a/hieradata/role/common/ci/master.yaml
b/hieradata/role/common/ci::master.yaml
similarity index 100%
rename from hieradata/role/common/ci/master.yaml
rename to hieradata/role/common/ci::master.yaml
diff --git a/hieradata/role/common/cluster/management.yaml
b/hieradata/role/common/cluster::management.yaml
similarity index 100%
rename from hieradata/role/common/cluster/management.yaml
rename to hieradata/role/common/cluster::management.yaml
diff --git a/hieradata/role/common/docker/registry.yaml
b/hieradata/role/common/docker::registry.yaml
similarity index 100%
rename from hieradata/role/common/docker/registry.yaml
rename to hieradata/role/common/docker::registry.yaml
diff --git a/hieradata/role/common/druid/analytics/worker.yaml
b/hieradata/role/common/druid::analytics::worker.yaml
similarity index 100%
rename from hieradata/role/common/druid/analytics/worker.yaml
rename to hieradata/role/common/druid::analytics::worker.yaml
diff --git a/hieradata/role/common/druid/public/worker.yaml
b/hieradata/role/common/druid::public::worker.yaml
similarity index 100%
rename from hieradata/role/common/druid/public/worker.yaml
rename to hieradata/role/common/druid::public::worker.yaml
diff --git a/hieradata/role/common/dumps/generation/worker/dumper.yaml
b/hieradata/role/common/dumps/generation/worker/dumper.yaml
deleted file mode 100644
index d65cd67..0000000
--- a/hieradata/role/common/dumps/generation/worker/dumper.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-admin::groups:
- - udp2log-users
- - deployment
- - snapshot-admins
diff --git a/hieradata/role/common/snapshot/dumper.yaml
b/hieradata/role/common/dumps::generation::worker::dumper.yaml
similarity index 100%
copy from hieradata/role/common/snapshot/dumper.yaml
copy to hieradata/role/common/dumps::generation::worker::dumper.yaml
diff --git a/hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
b/hieradata/role/common/dumps::generation::worker::dumper_misc.yaml
similarity index 100%
rename from hieradata/role/common/dumps/generation/worker/dumper_misc.yaml
rename to hieradata/role/common/dumps::generation::worker::dumper_misc.yaml
diff --git a/hieradata/role/common/dumps/generation/worker/testbed.yaml
b/hieradata/role/common/dumps::generation::worker::testbed.yaml
similarity index 100%
rename from hieradata/role/common/dumps/generation/worker/testbed.yaml
rename to hieradata/role/common/dumps::generation::worker::testbed.yaml
diff --git a/hieradata/role/common/dumps/web/htmldumps.yaml
b/hieradata/role/common/dumps::web::htmldumps.yaml
similarity index 100%
rename from hieradata/role/common/dumps/web/htmldumps.yaml
rename to hieradata/role/common/dumps::web::htmldumps.yaml
diff --git a/hieradata/role/common/elasticsearch/cirrus.yaml
b/hieradata/role/common/elasticsearch::cirrus.yaml
similarity index 100%
rename from hieradata/role/common/elasticsearch/cirrus.yaml
rename to hieradata/role/common/elasticsearch::cirrus.yaml
diff --git a/hieradata/role/common/elasticsearch/relforge.yaml
b/hieradata/role/common/elasticsearch::relforge.yaml
similarity index 100%
rename from hieradata/role/common/elasticsearch/relforge.yaml
rename to hieradata/role/common/elasticsearch::relforge.yaml
diff --git a/hieradata/role/common/etcd/kubernetes.yaml
b/hieradata/role/common/etcd::kubernetes.yaml
similarity index 100%
rename from hieradata/role/common/etcd/kubernetes.yaml
rename to hieradata/role/common/etcd::kubernetes.yaml
diff --git a/hieradata/role/common/etcd/networking.yaml
b/hieradata/role/common/etcd::networking.yaml
similarity index 100%
rename from hieradata/role/common/etcd/networking.yaml
rename to hieradata/role/common/etcd::networking.yaml
diff --git a/hieradata/role/common/eventbus/eventbus.yaml
b/hieradata/role/common/eventbus::eventbus.yaml
similarity index 100%
rename from hieradata/role/common/eventbus/eventbus.yaml
rename to hieradata/role/common/eventbus::eventbus.yaml
diff --git a/hieradata/role/common/eventlogging/analytics.yaml
b/hieradata/role/common/eventlogging::analytics.yaml
similarity index 100%
rename from hieradata/role/common/eventlogging/analytics.yaml
rename to hieradata/role/common/eventlogging::analytics.yaml
diff --git a/hieradata/role/common/graphite/production.yaml
b/hieradata/role/common/graphite::production.yaml
similarity index 100%
rename from hieradata/role/common/graphite/production.yaml
rename to hieradata/role/common/graphite::production.yaml
diff --git a/hieradata/role/common/installserver/dhcp.yaml
b/hieradata/role/common/installserver::dhcp.yaml
similarity index 100%
rename from hieradata/role/common/installserver/dhcp.yaml
rename to hieradata/role/common/installserver::dhcp.yaml
diff --git a/hieradata/role/common/jobqueue_redis/master.yaml
b/hieradata/role/common/jobqueue_redis::master.yaml
similarity index 100%
rename from hieradata/role/common/jobqueue_redis/master.yaml
rename to hieradata/role/common/jobqueue_redis::master.yaml
diff --git a/hieradata/role/common/jobqueue_redis/slave.yaml
b/hieradata/role/common/jobqueue_redis::slave.yaml
similarity index 100%
rename from hieradata/role/common/jobqueue_redis/slave.yaml
rename to hieradata/role/common/jobqueue_redis::slave.yaml
diff --git a/hieradata/role/common/kafka/analytics/broker.yaml
b/hieradata/role/common/kafka::analytics::broker.yaml
similarity index 100%
rename from hieradata/role/common/kafka/analytics/broker.yaml
rename to hieradata/role/common/kafka::analytics::broker.yaml
diff --git a/hieradata/role/common/kafka/analytics/burrow.yaml
b/hieradata/role/common/kafka::analytics::burrow.yaml
similarity index 100%
rename from hieradata/role/common/kafka/analytics/burrow.yaml
rename to hieradata/role/common/kafka::analytics::burrow.yaml
diff --git a/hieradata/role/common/kafka/jumbo/broker.yaml
b/hieradata/role/common/kafka::jumbo::broker.yaml
similarity index 100%
rename from hieradata/role/common/kafka/jumbo/broker.yaml
rename to hieradata/role/common/kafka::jumbo::broker.yaml
diff --git a/hieradata/role/common/kubernetes/master.yaml
b/hieradata/role/common/kubernetes::master.yaml
similarity index 100%
rename from hieradata/role/common/kubernetes/master.yaml
rename to hieradata/role/common/kubernetes::master.yaml
diff --git a/hieradata/role/common/kubernetes/staging/etcd.yaml
b/hieradata/role/common/kubernetes::staging::etcd.yaml
similarity index 100%
rename from hieradata/role/common/kubernetes/staging/etcd.yaml
rename to hieradata/role/common/kubernetes::staging::etcd.yaml
diff --git a/hieradata/role/common/kubernetes/staging/master.yaml
b/hieradata/role/common/kubernetes::staging::master.yaml
similarity index 100%
rename from hieradata/role/common/kubernetes/staging/master.yaml
rename to hieradata/role/common/kubernetes::staging::master.yaml
diff --git a/hieradata/role/common/kubernetes/staging/worker.yaml
b/hieradata/role/common/kubernetes::staging::worker.yaml
similarity index 100%
rename from hieradata/role/common/kubernetes/staging/worker.yaml
rename to hieradata/role/common/kubernetes::staging::worker.yaml
diff --git a/hieradata/role/common/kubernetes/worker.yaml
b/hieradata/role/common/kubernetes::worker.yaml
similarity index 100%
rename from hieradata/role/common/kubernetes/worker.yaml
rename to hieradata/role/common/kubernetes::worker.yaml
diff --git a/hieradata/role/common/labs/db/replica.yaml
b/hieradata/role/common/labs::db::replica.yaml
similarity index 100%
rename from hieradata/role/common/labs/db/replica.yaml
rename to hieradata/role/common/labs::db::replica.yaml
diff --git a/hieradata/role/common/labs/nfs/backup.yaml
b/hieradata/role/common/labs::nfs::backup.yaml
similarity index 100%
rename from hieradata/role/common/labs/nfs/backup.yaml
rename to hieradata/role/common/labs::nfs::backup.yaml
diff --git a/hieradata/role/common/labs/nfs/misc.yaml
b/hieradata/role/common/labs::nfs::misc.yaml
similarity index 100%
rename from hieradata/role/common/labs/nfs/misc.yaml
rename to hieradata/role/common/labs::nfs::misc.yaml
diff --git a/hieradata/role/common/labs/nfs/primary.yaml
b/hieradata/role/common/labs::nfs::primary.yaml
similarity index 100%
rename from hieradata/role/common/labs/nfs/primary.yaml
rename to hieradata/role/common/labs::nfs::primary.yaml
diff --git a/hieradata/role/common/labs/nfs/secondary.yaml
b/hieradata/role/common/labs::nfs::secondary.yaml
similarity index 100%
rename from hieradata/role/common/labs/nfs/secondary.yaml
rename to hieradata/role/common/labs::nfs::secondary.yaml
diff --git a/hieradata/role/common/labs/openstack/nova/api.yaml
b/hieradata/role/common/labs::openstack::nova::api.yaml
similarity index 100%
rename from hieradata/role/common/labs/openstack/nova/api.yaml
rename to hieradata/role/common/labs::openstack::nova::api.yaml
diff --git a/hieradata/role/common/labs/openstack/nova/compute.yaml
b/hieradata/role/common/labs::openstack::nova::compute.yaml
similarity index 100%
rename from hieradata/role/common/labs/openstack/nova/compute.yaml
rename to hieradata/role/common/labs::openstack::nova::compute.yaml
diff --git a/hieradata/role/common/labs/openstack/nova/controller.yaml
b/hieradata/role/common/labs::openstack::nova::controller.yaml
similarity index 100%
rename from hieradata/role/common/labs/openstack/nova/controller.yaml
rename to hieradata/role/common/labs::openstack::nova::controller.yaml
diff --git a/hieradata/role/common/labs/prometheus.yaml
b/hieradata/role/common/labs::prometheus.yaml
similarity index 100%
rename from hieradata/role/common/labs/prometheus.yaml
rename to hieradata/role/common/labs::prometheus.yaml
diff --git a/hieradata/role/common/labs/puppetmaster.yaml
b/hieradata/role/common/labs::puppetmaster.yaml
similarity index 100%
rename from hieradata/role/common/labs/puppetmaster.yaml
rename to hieradata/role/common/labs::puppetmaster.yaml
diff --git a/hieradata/role/common/logging/mediawiki/udp2log.yaml
b/hieradata/role/common/logging::mediawiki::udp2log.yaml
similarity index 100%
rename from hieradata/role/common/logging/mediawiki/udp2log.yaml
rename to hieradata/role/common/logging::mediawiki::udp2log.yaml
diff --git a/hieradata/role/common/logstash/apifeatureusage.yaml
b/hieradata/role/common/logstash::apifeatureusage.yaml
similarity index 100%
rename from hieradata/role/common/logstash/apifeatureusage.yaml
rename to hieradata/role/common/logstash::apifeatureusage.yaml
diff --git a/hieradata/role/common/logstash/collector.yaml
b/hieradata/role/common/logstash::collector.yaml
similarity index 100%
rename from hieradata/role/common/logstash/collector.yaml
rename to hieradata/role/common/logstash::collector.yaml
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml
b/hieradata/role/common/logstash::elasticsearch.yaml
similarity index 100%
rename from hieradata/role/common/logstash/elasticsearch.yaml
rename to hieradata/role/common/logstash::elasticsearch.yaml
diff --git a/hieradata/role/common/lvs/balancer.yaml
b/hieradata/role/common/lvs::balancer.yaml
similarity index 100%
rename from hieradata/role/common/lvs/balancer.yaml
rename to hieradata/role/common/lvs::balancer.yaml
diff --git a/hieradata/role/common/mail/mx.yaml
b/hieradata/role/common/mail::mx.yaml
similarity index 100%
rename from hieradata/role/common/mail/mx.yaml
rename to hieradata/role/common/mail::mx.yaml
diff --git a/hieradata/role/common/maps/master.yaml
b/hieradata/role/common/maps::master.yaml
similarity index 100%
rename from hieradata/role/common/maps/master.yaml
rename to hieradata/role/common/maps::master.yaml
diff --git a/hieradata/role/common/maps/slave.yaml
b/hieradata/role/common/maps::slave.yaml
similarity index 100%
rename from hieradata/role/common/maps/slave.yaml
rename to hieradata/role/common/maps::slave.yaml
diff --git a/hieradata/role/common/maps/test/master.yaml
b/hieradata/role/common/maps::test::master.yaml
similarity index 100%
rename from hieradata/role/common/maps/test/master.yaml
rename to hieradata/role/common/maps::test::master.yaml
diff --git a/hieradata/role/common/maps/test/slave.yaml
b/hieradata/role/common/maps::test::slave.yaml
similarity index 100%
rename from hieradata/role/common/maps/test/slave.yaml
rename to hieradata/role/common/maps::test::slave.yaml
diff --git a/hieradata/role/common/maps/test/vectortiles_master.yaml
b/hieradata/role/common/maps::test::vectortiles_master.yaml
similarity index 100%
rename from hieradata/role/common/maps/test/vectortiles_master.yaml
rename to hieradata/role/common/maps::test::vectortiles_master.yaml
diff --git a/hieradata/role/common/mariadb/analytics.yaml
b/hieradata/role/common/mariadb::analytics.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/analytics.yaml
rename to hieradata/role/common/mariadb::analytics.yaml
diff --git a/hieradata/role/common/mariadb/client.yaml
b/hieradata/role/common/mariadb::client.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/client.yaml
rename to hieradata/role/common/mariadb::client.yaml
diff --git a/hieradata/role/common/mariadb/core.yaml
b/hieradata/role/common/mariadb::core.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/core.yaml
rename to hieradata/role/common/mariadb::core.yaml
diff --git a/hieradata/role/common/mariadb/dbstore.yaml
b/hieradata/role/common/mariadb::dbstore.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/dbstore.yaml
rename to hieradata/role/common/mariadb::dbstore.yaml
diff --git a/hieradata/role/common/mariadb/dbstore_multiinstance.yaml
b/hieradata/role/common/mariadb::dbstore_multiinstance.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/dbstore_multiinstance.yaml
rename to hieradata/role/common/mariadb::dbstore_multiinstance.yaml
diff --git a/hieradata/role/common/mariadb/labs_deprecated.yaml
b/hieradata/role/common/mariadb::labs_deprecated.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/labs_deprecated.yaml
rename to hieradata/role/common/mariadb::labs_deprecated.yaml
diff --git a/hieradata/role/common/mariadb/misc.yaml
b/hieradata/role/common/mariadb::misc.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/misc.yaml
rename to hieradata/role/common/mariadb::misc.yaml
diff --git a/hieradata/role/common/mariadb/misc/eventlogging/master.yaml
b/hieradata/role/common/mariadb::misc::eventlogging::master.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/misc/eventlogging/master.yaml
rename to hieradata/role/common/mariadb::misc::eventlogging::master.yaml
diff --git a/hieradata/role/common/mariadb/misc/eventlogging/replica.yaml
b/hieradata/role/common/mariadb::misc::eventlogging::replica.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/misc/eventlogging/replica.yaml
rename to hieradata/role/common/mariadb::misc::eventlogging::replica.yaml
diff --git
a/hieradata/role/common/mariadb/misc/eventlogging/replica_config.yaml
b/hieradata/role/common/mariadb::misc::eventlogging::replica_config.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/misc/eventlogging/replica_config.yaml
rename to hieradata/role/common/mariadb::misc::eventlogging::replica_config.yaml
diff --git a/hieradata/role/common/mariadb/misc/phabricator.yaml
b/hieradata/role/common/mariadb::misc::phabricator.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/misc/phabricator.yaml
rename to hieradata/role/common/mariadb::misc::phabricator.yaml
diff --git a/hieradata/role/common/mariadb/otrsbackups.yaml
b/hieradata/role/common/mariadb::otrsbackups.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/otrsbackups.yaml
rename to hieradata/role/common/mariadb::otrsbackups.yaml
diff --git a/hieradata/role/common/mariadb/parsercache.yaml
b/hieradata/role/common/mariadb::parsercache.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/parsercache.yaml
rename to hieradata/role/common/mariadb::parsercache.yaml
diff --git a/hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
b/hieradata/role/common/mariadb::sanitarium_multiinstance.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/sanitarium_multiinstance.yaml
rename to hieradata/role/common/mariadb::sanitarium_multiinstance.yaml
diff --git a/hieradata/role/common/mariadb/sanitarium_multisource.yaml
b/hieradata/role/common/mariadb::sanitarium_multisource.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/sanitarium_multisource.yaml
rename to hieradata/role/common/mariadb::sanitarium_multisource.yaml
diff --git a/hieradata/role/common/mariadb/tendril.yaml
b/hieradata/role/common/mariadb::tendril.yaml
similarity index 100%
rename from hieradata/role/common/mariadb/tendril.yaml
rename to hieradata/role/common/mariadb::tendril.yaml
diff --git a/hieradata/role/common/mediawiki/appserver.yaml
b/hieradata/role/common/mediawiki::appserver.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/appserver.yaml
rename to hieradata/role/common/mediawiki::appserver.yaml
diff --git a/hieradata/role/common/mediawiki/appserver/api.yaml
b/hieradata/role/common/mediawiki::appserver::api.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/appserver/api.yaml
rename to hieradata/role/common/mediawiki::appserver::api.yaml
diff --git a/hieradata/role/common/mediawiki/appserver/canary_api.yaml
b/hieradata/role/common/mediawiki::appserver::canary_api.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/appserver/canary_api.yaml
rename to hieradata/role/common/mediawiki::appserver::canary_api.yaml
diff --git a/hieradata/role/common/mediawiki/canary_appserver.yaml
b/hieradata/role/common/mediawiki::canary_appserver.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/canary_appserver.yaml
rename to hieradata/role/common/mediawiki::canary_appserver.yaml
diff --git a/hieradata/role/common/mediawiki/imagescaler.yaml
b/hieradata/role/common/mediawiki::imagescaler.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/imagescaler.yaml
rename to hieradata/role/common/mediawiki::imagescaler.yaml
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml
b/hieradata/role/common/mediawiki::jobrunner.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/jobrunner.yaml
rename to hieradata/role/common/mediawiki::jobrunner.yaml
diff --git a/hieradata/role/common/mediawiki/memcached.yaml
b/hieradata/role/common/mediawiki::memcached.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/memcached.yaml
rename to hieradata/role/common/mediawiki::memcached.yaml
diff --git a/hieradata/role/common/mediawiki/videoscaler.yaml
b/hieradata/role/common/mediawiki::videoscaler.yaml
similarity index 100%
rename from hieradata/role/common/mediawiki/videoscaler.yaml
rename to hieradata/role/common/mediawiki::videoscaler.yaml
diff --git a/hieradata/role/common/ores/redis.yaml
b/hieradata/role/common/ores::redis.yaml
similarity index 100%
rename from hieradata/role/common/ores/redis.yaml
rename to hieradata/role/common/ores::redis.yaml
diff --git a/hieradata/role/common/ores/stresstest.yaml
b/hieradata/role/common/ores::stresstest.yaml
similarity index 100%
rename from hieradata/role/common/ores/stresstest.yaml
rename to hieradata/role/common/ores::stresstest.yaml
diff --git a/hieradata/role/common/osm/master.yaml
b/hieradata/role/common/osm::master.yaml
similarity index 100%
rename from hieradata/role/common/osm/master.yaml
rename to hieradata/role/common/osm::master.yaml
diff --git a/hieradata/role/common/osm/slave.yaml
b/hieradata/role/common/osm::slave.yaml
similarity index 100%
rename from hieradata/role/common/osm/slave.yaml
rename to hieradata/role/common/osm::slave.yaml
diff --git a/hieradata/role/common/parsoid/production.yaml
b/hieradata/role/common/parsoid::production.yaml
similarity index 100%
rename from hieradata/role/common/parsoid/production.yaml
rename to hieradata/role/common/parsoid::production.yaml
diff --git a/hieradata/role/common/parsoid/testing.yaml
b/hieradata/role/common/parsoid::testing.yaml
similarity index 100%
rename from hieradata/role/common/parsoid/testing.yaml
rename to hieradata/role/common/parsoid::testing.yaml
diff --git a/hieradata/role/common/paws_internal/jupyterhub.yaml
b/hieradata/role/common/paws_internal::jupyterhub.yaml
similarity index 100%
rename from hieradata/role/common/paws_internal/jupyterhub.yaml
rename to hieradata/role/common/paws_internal::jupyterhub.yaml
diff --git a/hieradata/role/common/piwik/server.yaml
b/hieradata/role/common/piwik::server.yaml
similarity index 100%
rename from hieradata/role/common/piwik/server.yaml
rename to hieradata/role/common/piwik::server.yaml
diff --git a/hieradata/role/common/prometheus/ops.yaml
b/hieradata/role/common/prometheus::ops.yaml
similarity index 100%
rename from hieradata/role/common/prometheus/ops.yaml
rename to hieradata/role/common/prometheus::ops.yaml
diff --git a/hieradata/role/common/puppetmaster/backend.yaml
b/hieradata/role/common/puppetmaster::backend.yaml
similarity index 100%
rename from hieradata/role/common/puppetmaster/backend.yaml
rename to hieradata/role/common/puppetmaster::backend.yaml
diff --git a/hieradata/role/common/puppetmaster/frontend.yaml
b/hieradata/role/common/puppetmaster::frontend.yaml
similarity index 100%
rename from hieradata/role/common/puppetmaster/frontend.yaml
rename to hieradata/role/common/puppetmaster::frontend.yaml
diff --git a/hieradata/role/common/restbase/dev_cluster.yaml
b/hieradata/role/common/restbase::dev_cluster.yaml
similarity index 100%
rename from hieradata/role/common/restbase/dev_cluster.yaml
rename to hieradata/role/common/restbase::dev_cluster.yaml
diff --git a/hieradata/role/common/restbase/production.yaml
b/hieradata/role/common/restbase::production.yaml
similarity index 100%
rename from hieradata/role/common/restbase/production.yaml
rename to hieradata/role/common/restbase::production.yaml
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase::production_ng.yaml
similarity index 100%
rename from hieradata/role/common/restbase/production_ng.yaml
rename to hieradata/role/common/restbase::production_ng.yaml
diff --git a/hieradata/role/common/restbase/test_cluster.yaml
b/hieradata/role/common/restbase::test_cluster.yaml
similarity index 100%
rename from hieradata/role/common/restbase/test_cluster.yaml
rename to hieradata/role/common/restbase::test_cluster.yaml
diff --git a/hieradata/role/common/snapshot/dumper.yaml
b/hieradata/role/common/snapshot::dumper.yaml
similarity index 100%
rename from hieradata/role/common/snapshot/dumper.yaml
rename to hieradata/role/common/snapshot::dumper.yaml
diff --git a/hieradata/role/common/snapshot/producer.yaml
b/hieradata/role/common/snapshot::producer.yaml
similarity index 100%
rename from hieradata/role/common/snapshot/producer.yaml
rename to hieradata/role/common/snapshot::producer.yaml
diff --git a/hieradata/role/common/spare/system.yaml
b/hieradata/role/common/spare::system.yaml
similarity index 100%
rename from hieradata/role/common/spare/system.yaml
rename to hieradata/role/common/spare::system.yaml
diff --git a/hieradata/role/common/statistics/cruncher.yaml
b/hieradata/role/common/statistics::cruncher.yaml
similarity index 100%
rename from hieradata/role/common/statistics/cruncher.yaml
rename to hieradata/role/common/statistics::cruncher.yaml
diff --git a/hieradata/role/common/statistics/explorer.yaml
b/hieradata/role/common/statistics::explorer.yaml
similarity index 100%
rename from hieradata/role/common/statistics/explorer.yaml
rename to hieradata/role/common/statistics::explorer.yaml
diff --git a/hieradata/role/common/statistics/private.yaml
b/hieradata/role/common/statistics::private.yaml
similarity index 100%
rename from hieradata/role/common/statistics/private.yaml
rename to hieradata/role/common/statistics::private.yaml
diff --git a/hieradata/role/common/striker/web.yaml
b/hieradata/role/common/striker::web.yaml
similarity index 100%
rename from hieradata/role/common/striker/web.yaml
rename to hieradata/role/common/striker::web.yaml
diff --git a/hieradata/role/common/swift/proxy.yaml
b/hieradata/role/common/swift::proxy.yaml
similarity index 100%
rename from hieradata/role/common/swift/proxy.yaml
rename to hieradata/role/common/swift::proxy.yaml
diff --git a/hieradata/role/common/swift/storage.yaml
b/hieradata/role/common/swift::storage.yaml
similarity index 100%
rename from hieradata/role/common/swift/storage.yaml
rename to hieradata/role/common/swift::storage.yaml
diff --git a/hieradata/role/common/syslog/centralserver.yaml
b/hieradata/role/common/syslog::centralserver.yaml
similarity index 100%
rename from hieradata/role/common/syslog/centralserver.yaml
rename to hieradata/role/common/syslog::centralserver.yaml
diff --git a/hieradata/role/common/thumbor/mediawiki.yaml
b/hieradata/role/common/thumbor::mediawiki.yaml
similarity index 100%
rename from hieradata/role/common/thumbor/mediawiki.yaml
rename to hieradata/role/common/thumbor::mediawiki.yaml
diff --git a/hieradata/role/common/xhgui/app.yaml
b/hieradata/role/common/xhgui::app.yaml
similarity index 100%
rename from hieradata/role/common/xhgui/app.yaml
rename to hieradata/role/common/xhgui::app.yaml
diff --git a/hieradata/role/eqiad/cache/misc.yaml
b/hieradata/role/eqiad/cache::misc.yaml
similarity index 100%
rename from hieradata/role/eqiad/cache/misc.yaml
rename to hieradata/role/eqiad/cache::misc.yaml
diff --git a/hieradata/role/eqiad/cache/text.yaml
b/hieradata/role/eqiad/cache::text.yaml
similarity index 100%
rename from hieradata/role/eqiad/cache/text.yaml
rename to hieradata/role/eqiad/cache::text.yaml
diff --git a/hieradata/role/eqiad/cache/upload.yaml
b/hieradata/role/eqiad/cache::upload.yaml
similarity index 100%
rename from hieradata/role/eqiad/cache/upload.yaml
rename to hieradata/role/eqiad/cache::upload.yaml
diff --git a/hieradata/role/eqiad/druid/public/worker.yaml
b/hieradata/role/eqiad/druid::public::worker.yaml
similarity index 100%
rename from hieradata/role/eqiad/druid/public/worker.yaml
rename to hieradata/role/eqiad/druid::public::worker.yaml
diff --git a/hieradata/role/eqiad/elasticsearch/cirrus.yaml
b/hieradata/role/eqiad/elasticsearch::cirrus.yaml
similarity index 100%
rename from hieradata/role/eqiad/elasticsearch/cirrus.yaml
rename to hieradata/role/eqiad/elasticsearch::cirrus.yaml
diff --git a/hieradata/role/eqiad/elasticsearch/relforge.yaml
b/hieradata/role/eqiad/elasticsearch::relforge.yaml
similarity index 100%
rename from hieradata/role/eqiad/elasticsearch/relforge.yaml
rename to hieradata/role/eqiad/elasticsearch::relforge.yaml
diff --git a/hieradata/role/eqiad/graphite/production.yaml
b/hieradata/role/eqiad/graphite::production.yaml
similarity index 100%
rename from hieradata/role/eqiad/graphite/production.yaml
rename to hieradata/role/eqiad/graphite::production.yaml
diff --git a/hieradata/role/eqiad/kubernetes/master.yaml
b/hieradata/role/eqiad/kubernetes::master.yaml
similarity index 100%
rename from hieradata/role/eqiad/kubernetes/master.yaml
rename to hieradata/role/eqiad/kubernetes::master.yaml
diff --git a/hieradata/role/eqiad/kubernetes/worker.yaml
b/hieradata/role/eqiad/kubernetes::worker.yaml
similarity index 100%
rename from hieradata/role/eqiad/kubernetes/worker.yaml
rename to hieradata/role/eqiad/kubernetes::worker.yaml
diff --git a/hieradata/role/eqiad/labs/openstack/nova/network.yaml
b/hieradata/role/eqiad/labs::openstack::nova::network.yaml
similarity index 100%
rename from hieradata/role/eqiad/labs/openstack/nova/network.yaml
rename to hieradata/role/eqiad/labs::openstack::nova::network.yaml
diff --git a/hieradata/role/eqiad/labs/puppetmaster.yaml
b/hieradata/role/eqiad/labs::puppetmaster.yaml
similarity index 100%
rename from hieradata/role/eqiad/labs/puppetmaster.yaml
rename to hieradata/role/eqiad/labs::puppetmaster.yaml
diff --git a/hieradata/role/eqiad/lvs/balancer.yaml
b/hieradata/role/eqiad/lvs::balancer.yaml
similarity index 100%
rename from hieradata/role/eqiad/lvs/balancer.yaml
rename to hieradata/role/eqiad/lvs::balancer.yaml
diff --git a/hieradata/role/eqiad/maps/master.yaml
b/hieradata/role/eqiad/maps::master.yaml
similarity index 100%
rename from hieradata/role/eqiad/maps/master.yaml
rename to hieradata/role/eqiad/maps::master.yaml
diff --git a/hieradata/role/eqiad/maps/slave.yaml
b/hieradata/role/eqiad/maps::slave.yaml
similarity index 100%
rename from hieradata/role/eqiad/maps/slave.yaml
rename to hieradata/role/eqiad/maps::slave.yaml
diff --git a/hieradata/role/eqiad/mediawiki/jobrunner.yaml
b/hieradata/role/eqiad/mediawiki::jobrunner.yaml
similarity index 100%
rename from hieradata/role/eqiad/mediawiki/jobrunner.yaml
rename to hieradata/role/eqiad/mediawiki::jobrunner.yaml
diff --git a/hieradata/role/eqiad/ores/redis.yaml
b/hieradata/role/eqiad/ores::redis.yaml
similarity index 100%
rename from hieradata/role/eqiad/ores/redis.yaml
rename to hieradata/role/eqiad/ores::redis.yaml
diff --git a/hieradata/role/eqiad/parsoid/production.yaml
b/hieradata/role/eqiad/parsoid::production.yaml
similarity index 100%
rename from hieradata/role/eqiad/parsoid/production.yaml
rename to hieradata/role/eqiad/parsoid::production.yaml
diff --git a/hieradata/role/eqiad/prometheus/ops.yaml
b/hieradata/role/eqiad/prometheus::ops.yaml
similarity index 100%
rename from hieradata/role/eqiad/prometheus/ops.yaml
rename to hieradata/role/eqiad/prometheus::ops.yaml
diff --git a/hieradata/role/eqiad/puppetmaster/backend.yaml
b/hieradata/role/eqiad/puppetmaster::backend.yaml
similarity index 100%
rename from hieradata/role/eqiad/puppetmaster/backend.yaml
rename to hieradata/role/eqiad/puppetmaster::backend.yaml
diff --git a/hieradata/role/eqiad/puppetmaster/frontend.yaml
b/hieradata/role/eqiad/puppetmaster::frontend.yaml
similarity index 100%
rename from hieradata/role/eqiad/puppetmaster/frontend.yaml
rename to hieradata/role/eqiad/puppetmaster::frontend.yaml
diff --git a/hieradata/role/eqiad/restbase/production.yaml
b/hieradata/role/eqiad/restbase::production.yaml
similarity index 100%
rename from hieradata/role/eqiad/restbase/production.yaml
rename to hieradata/role/eqiad/restbase::production.yaml
diff --git a/hieradata/role/eqiad/restbase/test_cluster.yaml
b/hieradata/role/eqiad/restbase::test_cluster.yaml
similarity index 100%
rename from hieradata/role/eqiad/restbase/test_cluster.yaml
rename to hieradata/role/eqiad/restbase::test_cluster.yaml
diff --git a/hieradata/role/eqiad/swift/proxy.yaml
b/hieradata/role/eqiad/swift::proxy.yaml
similarity index 100%
rename from hieradata/role/eqiad/swift/proxy.yaml
rename to hieradata/role/eqiad/swift::proxy.yaml
diff --git a/hieradata/role/eqiad/swift/storage.yaml
b/hieradata/role/eqiad/swift::storage.yaml
similarity index 100%
rename from hieradata/role/eqiad/swift/storage.yaml
rename to hieradata/role/eqiad/swift::storage.yaml
diff --git a/hieradata/role/eqiad/thumbor/mediawiki.yaml
b/hieradata/role/eqiad/thumbor::mediawiki.yaml
similarity index 100%
rename from hieradata/role/eqiad/thumbor/mediawiki.yaml
rename to hieradata/role/eqiad/thumbor::mediawiki.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/control.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::control.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/control.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::control.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::net.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/net.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::net.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/net_standby.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::net_standby.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/net_standby.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::net_standby.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/nodepool.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::nodepool.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/nodepool.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::nodepool.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/backend.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::backend.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/backend.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::backend.yaml
diff --git
a/hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/frontend.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::frontend.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/puppetmaster/frontend.yaml
rename to
hieradata/role/eqiad/wmcs::openstack::main::puppetmaster::frontend.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/services_primary.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::services_primary.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/services_primary.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::services_primary.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/services_secondary.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::services_secondary.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/services_secondary.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::services_secondary.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/virt.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::virt.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/virt.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::virt.yaml
diff --git a/hieradata/role/eqiad/wmcs/openstack/main/wikitech.yaml
b/hieradata/role/eqiad/wmcs::openstack::main::wikitech.yaml
similarity index 100%
rename from hieradata/role/eqiad/wmcs/openstack/main/wikitech.yaml
rename to hieradata/role/eqiad/wmcs::openstack::main::wikitech.yaml
diff --git a/hieradata/role/esams/cache/misc.yaml
b/hieradata/role/esams/cache::misc.yaml
similarity index 100%
rename from hieradata/role/esams/cache/misc.yaml
rename to hieradata/role/esams/cache::misc.yaml
diff --git a/hieradata/role/esams/cache/text.yaml
b/hieradata/role/esams/cache::text.yaml
similarity index 100%
rename from hieradata/role/esams/cache/text.yaml
rename to hieradata/role/esams/cache::text.yaml
diff --git a/hieradata/role/esams/cache/upload.yaml
b/hieradata/role/esams/cache::upload.yaml
similarity index 100%
rename from hieradata/role/esams/cache/upload.yaml
rename to hieradata/role/esams/cache::upload.yaml
diff --git a/hieradata/role/esams/lvs/balancer.yaml
b/hieradata/role/esams/lvs::balancer.yaml
similarity index 100%
rename from hieradata/role/esams/lvs/balancer.yaml
rename to hieradata/role/esams/lvs::balancer.yaml
diff --git a/hieradata/role/esams/swift/proxy.yaml
b/hieradata/role/esams/swift::proxy.yaml
similarity index 100%
rename from hieradata/role/esams/swift/proxy.yaml
rename to hieradata/role/esams/swift::proxy.yaml
diff --git a/hieradata/role/esams/swift/storage.yaml
b/hieradata/role/esams/swift::storage.yaml
similarity index 100%
rename from hieradata/role/esams/swift/storage.yaml
rename to hieradata/role/esams/swift::storage.yaml
diff --git a/hieradata/role/ulsfo/cache/misc.yaml
b/hieradata/role/ulsfo/cache::misc.yaml
similarity index 100%
rename from hieradata/role/ulsfo/cache/misc.yaml
rename to hieradata/role/ulsfo/cache::misc.yaml
diff --git a/hieradata/role/ulsfo/cache/text.yaml
b/hieradata/role/ulsfo/cache::text.yaml
similarity index 100%
rename from hieradata/role/ulsfo/cache/text.yaml
rename to hieradata/role/ulsfo/cache::text.yaml
diff --git a/hieradata/role/ulsfo/cache/upload.yaml
b/hieradata/role/ulsfo/cache::upload.yaml
similarity index 100%
rename from hieradata/role/ulsfo/cache/upload.yaml
rename to hieradata/role/ulsfo/cache::upload.yaml
diff --git a/hieradata/role/ulsfo/lvs/balancer.yaml
b/hieradata/role/ulsfo/lvs::balancer.yaml
similarity index 100%
rename from hieradata/role/ulsfo/lvs/balancer.yaml
rename to hieradata/role/ulsfo/lvs::balancer.yaml
diff --git a/modules/puppetmaster/files/production.hiera.yaml
b/modules/puppetmaster/files/production.hiera.yaml
index 0975900..cddfd02 100644
--- a/modules/puppetmaster/files/production.hiera.yaml
+++ b/modules/puppetmaster/files/production.hiera.yaml
@@ -1,13 +1,10 @@
:backends:
- nuyaml
- - role
-:role:
- :datadir: /etc/puppet/hieradata
:nuyaml:
:datadir: /etc/puppet/hieradata
:expand_path:
- - common
- - "%{::site}"
+ - common
+ - "%{::site}"
:private:
:datadir: /etc/puppet/private/hieradata
:hierarchy:
@@ -18,9 +15,7 @@
- "private/%{::site}"
- "common"
- "private/common"
-
-:role_hierarchy:
- - "%{::site}"
- - "common"
- - "private/%{::site}"
- - "private/common"
+ - "role/%{::site}/%{::_role}"
+ - "role/common/%{::_role}"
+ - "private/role/%{::site}/%{::_role}"
+ - "private/role/common/%{::_role}"
--
To view, visit https://gerrit.wikimedia.org/r/402347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10176ac3dd0f32408a0ccd3b539a29843bdcf8f
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
