From b77729948d4aa509be223e3397fe7ccdc8da00c0 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Wed, 10 May 2017 23:12:21 -0700 Subject: [PATCH] Updated to proper paths --- puppet/Puppetfile | 4 ---- puppet/production/Puppetfile | 9 +++++++++ puppet/{ => production}/environment.conf | 0 puppet/{ => production}/hieradata/common.yaml | 0 .../{ => production}/hieradata/nodes/example-node.yaml | 0 puppet/{ => production}/manifests/site.pp | 4 +--- puppet/{ => production}/scripts/config_version.rb | 0 puppet/{ => production}/scripts/config_version.sh | 0 puppet/{ => production}/site/profile/manifests/base.pp | 0 puppet/{ => production}/site/role/manifests/server.pp | 0 .../{ => production}/site/role/manifests/workstation.pp | 0 11 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 puppet/Puppetfile create mode 100644 puppet/production/Puppetfile rename puppet/{ => production}/environment.conf (100%) rename puppet/{ => production}/hieradata/common.yaml (100%) rename puppet/{ => production}/hieradata/nodes/example-node.yaml (100%) rename puppet/{ => production}/manifests/site.pp (76%) rename puppet/{ => production}/scripts/config_version.rb (100%) rename puppet/{ => production}/scripts/config_version.sh (100%) rename puppet/{ => production}/site/profile/manifests/base.pp (100%) rename puppet/{ => production}/site/role/manifests/server.pp (100%) rename puppet/{ => production}/site/role/manifests/workstation.pp (100%) diff --git a/puppet/Puppetfile b/puppet/Puppetfile deleted file mode 100644 index 60c2dd5..0000000 --- a/puppet/Puppetfile +++ /dev/null @@ -1,4 +0,0 @@ -# rubocop:disable FileName -forge 'http://forge.puppetlabs.com' - -mod 'puppetlabs-vcsrepo', '1.5.0' diff --git a/puppet/production/Puppetfile b/puppet/production/Puppetfile new file mode 100644 index 0000000..d23d9fd --- /dev/null +++ b/puppet/production/Puppetfile @@ -0,0 +1,9 @@ +# rubocop:disable FileName +forge 'http://forge.puppetlabs.com' + +#moduledir '~/.dotfiles/vendor/puppet_modules' +moduledir "#{File.dirname(File.dirname(__FILE__))}/vendor/puppet_modules" + +mod 'homebrew', + :git => 'https://github.com/boxen/puppet-homebrew.git' +mod 'puppetlabs-vcsrepo', '1.5.0' diff --git a/puppet/environment.conf b/puppet/production/environment.conf similarity index 100% rename from puppet/environment.conf rename to puppet/production/environment.conf diff --git a/puppet/hieradata/common.yaml b/puppet/production/hieradata/common.yaml similarity index 100% rename from puppet/hieradata/common.yaml rename to puppet/production/hieradata/common.yaml diff --git a/puppet/hieradata/nodes/example-node.yaml b/puppet/production/hieradata/nodes/example-node.yaml similarity index 100% rename from puppet/hieradata/nodes/example-node.yaml rename to puppet/production/hieradata/nodes/example-node.yaml diff --git a/puppet/manifests/site.pp b/puppet/production/manifests/site.pp similarity index 76% rename from puppet/manifests/site.pp rename to puppet/production/manifests/site.pp index ea699c8..7fa91bf 100644 --- a/puppet/manifests/site.pp +++ b/puppet/production/manifests/site.pp @@ -8,7 +8,5 @@ # specified in the via an ENC for that node. node default { - # This is where you can declare classes for all nodes. - # Example: - # class { 'my_class': } + notify{'This is from the default node.':} } diff --git a/puppet/scripts/config_version.rb b/puppet/production/scripts/config_version.rb similarity index 100% rename from puppet/scripts/config_version.rb rename to puppet/production/scripts/config_version.rb diff --git a/puppet/scripts/config_version.sh b/puppet/production/scripts/config_version.sh similarity index 100% rename from puppet/scripts/config_version.sh rename to puppet/production/scripts/config_version.sh diff --git a/puppet/site/profile/manifests/base.pp b/puppet/production/site/profile/manifests/base.pp similarity index 100% rename from puppet/site/profile/manifests/base.pp rename to puppet/production/site/profile/manifests/base.pp diff --git a/puppet/site/role/manifests/server.pp b/puppet/production/site/role/manifests/server.pp similarity index 100% rename from puppet/site/role/manifests/server.pp rename to puppet/production/site/role/manifests/server.pp diff --git a/puppet/site/role/manifests/workstation.pp b/puppet/production/site/role/manifests/workstation.pp similarity index 100% rename from puppet/site/role/manifests/workstation.pp rename to puppet/production/site/role/manifests/workstation.pp