diff options
-rwxr-xr-x | bin/provision | 2 | ||||
-rw-r--r-- | config/bootstrap.yaml (renamed from hiera/bootstrap.yaml) | 0 | ||||
-rw-r--r-- | config/common.yaml (renamed from hiera/common.yaml) | 0 | ||||
-rw-r--r-- | config/hiera.yaml (renamed from hiera/hiera.yaml) | 2 | ||||
-rw-r--r-- | config/node/puppet-bootstrap.example.org.yaml (renamed from hiera/node/puppet-bootstrap.example.org.yaml) | 0 | ||||
l--------- | hiera.yaml | 2 |
6 files changed, 3 insertions, 3 deletions
diff --git a/bin/provision b/bin/provision index 16f102f..a3036c2 100755 --- a/bin/provision +++ b/bin/provision @@ -25,7 +25,7 @@ done # Link hiera configuration if needed. if [ ! -h "/etc/puppet/hiera.yaml" ]; then $SUDO rm -f /etc/puppet/hiera.yaml - $SUDO ln -s $DIRNAME/../hiera/hiera.yaml /etc/puppet/hiera.yaml + $SUDO ln -s $DIRNAME/../config/hiera.yaml /etc/puppet/hiera.yaml fi # Link puppet configuration if needed. diff --git a/hiera/bootstrap.yaml b/config/bootstrap.yaml index ce72bfb..ce72bfb 100644 --- a/hiera/bootstrap.yaml +++ b/config/bootstrap.yaml diff --git a/hiera/common.yaml b/config/common.yaml index 006c5a8..006c5a8 100644 --- a/hiera/common.yaml +++ b/config/common.yaml diff --git a/hiera/hiera.yaml b/config/hiera.yaml index a8ae792..2e5600c 100644 --- a/hiera/hiera.yaml +++ b/config/hiera.yaml @@ -8,7 +8,7 @@ # reconsidered in the future. # # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html - :datadir: '%{settings::confdir}/hiera' + :datadir: '%{settings::confdir}/config' :hierarchy: # # Put in the secrets folder all sensitive information that diff --git a/hiera/node/puppet-bootstrap.example.org.yaml b/config/node/puppet-bootstrap.example.org.yaml index c108e7d..c108e7d 100644 --- a/hiera/node/puppet-bootstrap.example.org.yaml +++ b/config/node/puppet-bootstrap.example.org.yaml @@ -1 +1 @@ -hiera/hiera.yaml
\ No newline at end of file +config/hiera.yaml
\ No newline at end of file |