Changed Production Branch

automatecloud · Sep 1, 2015 · c4a4d6b · c4a4d6b
1 parent 82c58ef
commit c4a4d6b
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 314 deletions.
diff --git a/Puppetfile b/Puppetfile
@@ -171,4 +171,3 @@ mod 'windowsfeature',
 mod 'wordpress',
   :git => '/opt/puppetlabs/repos/wordpress.git',
   :ref => 'master'
-
diff --git a/README.md b/README.md
@@ -1 +1,2 @@
-#This is the Branch for the production environment inside my puppet enterprise demo environment
+### Puppet CodeManager demo
+This is the Branch for the production environment inside my puppet enterprise demo environment
diff --git a/Rakefile b/Rakefile
diff --git a/environment.conf b/environment.conf
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
diff --git a/hieradata/datacenter/infrastructure.yaml b/hieradata/datacenter/infrastructure.yaml
diff --git a/hieradata/datacenter/portland.yaml b/hieradata/datacenter/portland.yaml
diff --git a/hieradata/datacenter/sydney.yaml b/hieradata/datacenter/sydney.yaml
diff --git a/hieradata/environment/preproduction.yaml b/hieradata/environment/preproduction.yaml
@@ -0,0 +1,6 @@
+---
+ntp::servers:
+  - '0.au.pool.ntp.org'
+  - '1.au.pool.ntp.org'
+  - '2.au.pool.ntp.org'
+  - '3.au.pool.ntp.org'
diff --git a/hieradata/environment/test.yaml b/hieradata/environment/test.yaml
@@ -0,0 +1,6 @@
+---
+ntp::servers:
+  - 0.us.pool.ntp.org
+  - 1.us.pool.ntp.org
+  - 2.us.pool.ntp.org
+  - 3.us.pool.ntp.org
diff --git a/hieradata/virtual/virtualbox.yaml b/hieradata/virtual/virtualbox.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -171,4 +171,3 @@ mod 'windowsfeature',
		mod 'wordpress',
		:git => '/opt/puppetlabs/repos/wordpress.git',
		:ref => 'master'