Filippo Giunchedi has submitted this change and it was merged.
Change subject: hiera: use hieradata everywhere
......................................................................
hiera: use hieradata everywhere
this matches the puppetmaster symlinks with what's both in private.git and
puppet.git
Change-Id: I72cc0ac26b87ea49801df34674ac8025c19a5b44
---
M modules/puppetmaster/files/labs.hiera.yaml
M modules/puppetmaster/files/production.hiera.yaml
M modules/puppetmaster/manifests/gitclone.pp
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
diff --git a/modules/puppetmaster/files/labs.hiera.yaml
b/modules/puppetmaster/files/labs.hiera.yaml
index 683be03..b2eea2a 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -1,12 +1,12 @@
:backends:
- nuyaml
:nuyaml:
- :datadir: /etc/puppet/hiera
+ :datadir: /etc/puppet/hieradata
:expand_path:
- common
- realm
:private:
- :datadir: /etc/puppet/private
+ :datadir: /etc/puppet/private/hieradata
:hierarchy:
- "labs/host/%{::hostname}"
- "labs/%{::labsproject}"
diff --git a/modules/puppetmaster/files/production.hiera.yaml
b/modules/puppetmaster/files/production.hiera.yaml
index 8bf9c08..1600ea5 100644
--- a/modules/puppetmaster/files/production.hiera.yaml
+++ b/modules/puppetmaster/files/production.hiera.yaml
@@ -1,14 +1,14 @@
:backends:
- nuyaml
:nuyaml:
- :datadir: /etc/puppet/hiera
+ :datadir: /etc/puppet/hieradata
:dynlookup:
- mainrole
:expand_path:
- common
- realm
:private:
- :datadir: /etc/puppet/private/hiera
+ :datadir: /etc/puppet/private/hieradata
:hierarchy:
- "hosts/%{::hostname}"
- "%{::realm}"
diff --git a/modules/puppetmaster/manifests/gitclone.pp
b/modules/puppetmaster/manifests/gitclone.pp
index 4c23472..358d137 100644
--- a/modules/puppetmaster/manifests/gitclone.pp
+++ b/modules/puppetmaster/manifests/gitclone.pp
@@ -135,7 +135,7 @@
target => "${puppetmaster::gitdir}/operations/puppet/modules",
force => true,
}
- file { '/etc/puppet/hiera':
+ file { '/etc/puppet/hieradata':
ensure => link,
target => "${puppetmaster::gitdir}/operations/puppet/hieradata",
force => true,
--
To view, visit https://gerrit.wikimedia.org/r/163588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72cc0ac26b87ea49801df34674ac8025c19a5b44
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
