flatten hiera role_config/syncproxy/mirror_basedir_prefix to role_config__syncproxy...

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index b0cbf20..22f6046 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,9 +3,8 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
-role_config:
-  syncproxy:
-    mirror_basedir_prefix: '/srv/mirrors/'
+role_config__syncproxy:
+  mirror_basedir_prefix: '/srv/mirrors/'
 roles:
   bugsmx:
     - buxtehude.debian.org

diff --git a/hieradata/nodes/mirror-conova.debian.org.yaml b/hieradata/nodes/mirror-conova.debian.org.yaml
index 9dfe28f..d1afe2b 100644 (file)
--- a/hieradata/nodes/mirror-conova.debian.org.yaml
+++ b/hieradata/nodes/mirror-conova.debian.org.yaml
@@ -1,3 +1,2 @@
-role_config:
-  syncproxy:
-    mirror_basedir_prefix: '/srv/mirrors/syncproxy-'
+role_config__syncproxy:
+  mirror_basedir_prefix: '/srv/mirrors/syncproxy-'

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 3b4816d..146fcda 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,7 +1,7 @@
 class roles::syncproxy {
        include roles::archvsync_base
 
-       $mirror_basedir_prefix = hiera('role_config.syncproxy.mirror_basedir_prefix')
+       $mirror_basedir_prefix = hiera('role_config__syncproxy.mirror_basedir_prefix')
 
        $binds = $::hostname ? {
                'milanollo'    => [ '5.153.231.9', '[2001:41c8:1000:21::21:9]' ],