From 0af9bbf52d7283902141f05da3c642dcd2d64231 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Tue, 18 Aug 2015 14:01:20 -0700 Subject: [PATCH] Move some hieradata around for easier testing in vagrant I now have a virtual hierarchy level for setting up my lower memory settings when using vagrant/virtualbox. The gms settings are in an example-puppet-master.yaml file in the nodes directory which are needed for the instructions. --- hieradata/nodes/example-puppet-master.yaml | 4 ++++ .../{nodes/puppet-master.yaml => virtual/virtualbox.yaml} | 0 site/profile/manifests/puppetmaster.pp | 1 + 3 files changed, 5 insertions(+) create mode 100644 hieradata/nodes/example-puppet-master.yaml rename hieradata/{nodes/puppet-master.yaml => virtual/virtualbox.yaml} (100%) diff --git a/hieradata/nodes/example-puppet-master.yaml b/hieradata/nodes/example-puppet-master.yaml new file mode 100644 index 0000000..677e10d --- /dev/null +++ b/hieradata/nodes/example-puppet-master.yaml @@ -0,0 +1,4 @@ +--- +git_management_system: 'gitlab' +gms_server_url: 'https://gitlab-server' +gms_api_token: 'BDkZfWWnk4LVTLHdAywd' diff --git a/hieradata/nodes/puppet-master.yaml b/hieradata/virtual/virtualbox.yaml similarity index 100% rename from hieradata/nodes/puppet-master.yaml rename to hieradata/virtual/virtualbox.yaml diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index 20a4416..95a4408 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -2,6 +2,7 @@ class profile::puppetmaster { class { 'hiera': hierarchy => [ + 'virtual/%{::virtual}', 'nodes/%{::trusted.certname}', 'common', ],