From 77a18afd83bba7e04bd8372b868c14f0c508b0e6 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 12 Sep 2017 11:52:29 +0000 Subject: [PATCH] flatten hiera role_config/syncproxy/mirror_basedir_prefix to role_config__syncproxy/mirror_basedir_prefix --- hieradata/common.yaml | 5 ++--- hieradata/nodes/mirror-conova.debian.org.yaml | 5 ++--- modules/roles/manifests/syncproxy.pp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index b0cbf208f..22f6046e5 100644 --- 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 9dfe28ffa..d1afe2b8d 100644 --- 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 3b4816d6a..146fcda8b 100644 --- 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]' ], -- 2.20.1