Merge b509d1b203 into 01346d7d21

2016-05-19 23:44:42 +00:00 · 2016-05-19 23:44:42 +00:00 · 5288edd5df
commit 5288edd5df
parent 01346d7d21 b509d1b203
5 changed files with 18 additions and 1 deletions
--- a/8
+++ b/8
@ -1,10 +1,18 @@
 forge "http://forge.puppetlabs.com"

+# This is a test comment
 # Modules from the Puppet Forge
 # Versions should be updated to be the latest at the time you start
 #mod "puppetlabs/inifile",     '1.5.0'
 #mod "puppetlabs/stdlib",      '4.11.0'
 #mod "puppetlabs/concat",      '2.1.0'
+mod "puppetlabs/stdlib", '4.12.0'
+mod "puppetlabs/ruby", '0.4.0'
+mod "puppetlabs/pe_gem", '0.2.0'
+mod "puppetlabs/apt", '2.2.2'
+mod "nanliu/staging", '1.0.3'
+mod "puppetlabs/azure", '1.0.2'
+

 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
--- a/environment.conf
+++ b/environment.conf
@ -1,2 +1,4 @@
-modulepath          = modules:site:$basemodulepath
+modulepath          = modules:site:$basemodulepath:/etc/puppetlabs/code/environments/test/modules
 config_version      = 'scripts/config_version.sh $environmentpath $environment'
+environment_timeout = unlimited
+##what now?
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@ -3,3 +3,6 @@ message: "This node is using common data"

 #Puppet Server Tuning
 puppet_enterprise::master::puppetserver::jruby_max_requests_per_instance: 0
+
+zabbix::repo::manage_repo: false
+puppet_enterprise::master::puppetserver::environment-class-cache-enabled:false
--- a/1
+++ b/1
@ -0,0 +1 @@
+new content!
--- a/3
+++ b/3
@ -0,0 +1,3 @@
+new stuff!!
+
+yeah