diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2015-11-06 11:01:26 -0200 |
commit | 8748f432cdb01090767001523496f096345a492b (patch) | |
tree | cba4fd0d8d4501424c7fb5e84ba37dc2cdd7fca4 /puppet/hiera/common.yaml | |
parent | 506b62a99e35c69354e8bc977780e41117f1e6ca (diff) | |
parent | 5512c493e13998d4c83d7eab3d89e5a1c0836566 (diff) | |
download | debian-8748f432cdb01090767001523496f096345a492b.tar.gz debian-8748f432cdb01090767001523496f096345a492b.tar.bz2 |
Merge commit '5512c493e13998d4c83d7eab3d89e5a1c0836566' into develop
Conflicts:
puppet/puppet.conf
Diffstat (limited to 'puppet/hiera/common.yaml')
-rw-r--r-- | puppet/hiera/common.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/hiera/common.yaml b/puppet/hiera/common.yaml index d7e35a1..8a04a26 100644 --- a/puppet/hiera/common.yaml +++ b/puppet/hiera/common.yaml @@ -48,3 +48,8 @@ ntp::servers: nodo::subsystem::resolver::nameservers: - '208.67.222.222' - '208.67.220.220' + +# +# Puppet config +# +nodo::base::puppet_mode: 'apply' |