From a79feb3933ada37477aaabe91d34dc5496f5eabf Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 08:35:11 +0000 Subject: [PATCH 1/7] Add ntp module --- Puppetfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Puppetfile b/Puppetfile index b282b85..79db490 100644 --- a/Puppetfile +++ b/Puppetfile @@ -2,9 +2,10 @@ forge "http://forge.puppetlabs.com" # 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/inifile", '1.5.0' +mod "puppetlabs/stdlib", '4.11.0' +mod "puppetlabs/concat", '2.1.0' +mod "puppetlabs/ntp", 'latest' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From aaa5c7f41821cf457b76f2fe565112a06c3b9d48 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 09:17:26 +0000 Subject: [PATCH 2/7] Add ntp module --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 79db490..192f5ae 100644 --- a/Puppetfile +++ b/Puppetfile @@ -5,7 +5,7 @@ forge "http://forge.puppetlabs.com" mod "puppetlabs/inifile", '1.5.0' mod "puppetlabs/stdlib", '4.11.0' mod "puppetlabs/concat", '2.1.0' -mod "puppetlabs/ntp", 'latest' +mod "puppetlabs/ntp", :latest # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 36c6bb2bc4651ec8e7488d1c507895b68e749f52 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 09:17:48 +0000 Subject: [PATCH 3/7] Add ntp module --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 192f5ae..f8e12a7 100644 --- a/Puppetfile +++ b/Puppetfile @@ -5,7 +5,7 @@ forge "http://forge.puppetlabs.com" mod "puppetlabs/inifile", '1.5.0' mod "puppetlabs/stdlib", '4.11.0' mod "puppetlabs/concat", '2.1.0' -mod "puppetlabs/ntp", :latest +mod "puppetlabs/ntp", latest # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 204950fa8f503b8a72bdcf1f913552c50a966847 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 09:18:17 +0000 Subject: [PATCH 4/7] Fix syntax mistake ntp module latest version --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index f8e12a7..192f5ae 100644 --- a/Puppetfile +++ b/Puppetfile @@ -5,7 +5,7 @@ forge "http://forge.puppetlabs.com" mod "puppetlabs/inifile", '1.5.0' mod "puppetlabs/stdlib", '4.11.0' mod "puppetlabs/concat", '2.1.0' -mod "puppetlabs/ntp", latest +mod "puppetlabs/ntp", :latest # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 3c1d5c6e6723af2c9f145b25ea515e03a26424c0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 10:19:56 +0000 Subject: [PATCH 5/7] Add network module --- Puppetfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Puppetfile b/Puppetfile index 192f5ae..18b6da1 100644 --- a/Puppetfile +++ b/Puppetfile @@ -6,6 +6,7 @@ mod "puppetlabs/inifile", '1.5.0' mod "puppetlabs/stdlib", '4.11.0' mod "puppetlabs/concat", '2.1.0' mod "puppetlabs/ntp", :latest +mod "example42/network", :latest # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples From 7cc5fc6ab59ab4a21a063cedbd526656e82371ca Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 10:36:34 +0000 Subject: [PATCH 6/7] Add base network and ntp profile site --- site/profile/manifests/base.pp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index ae85e65..9eb33c4 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -2,4 +2,15 @@ class profile::base { #the base profile should include component modules that will be on all nodes + class { '::ntp': + servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ], + } + + network::mroute { 'eth0': + routes => { + '192.168.2.0/24' => '192.168.1.1', + '80.81.82.0/16' => 'eth0', + } + } + } From bc482a51517935ddf2b267665d2f09a5fb371571 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2016 10:40:31 +0000 Subject: [PATCH 7/7] Add base network and ntp profile site and fix the network class --- site/profile/manifests/base.pp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site/profile/manifests/base.pp b/site/profile/manifests/base.pp index 9eb33c4..5447086 100644 --- a/site/profile/manifests/base.pp +++ b/site/profile/manifests/base.pp @@ -6,6 +6,10 @@ class profile::base { servers => [ 'ntp1.corp.com', 'ntp2.corp.com' ], } + class { 'network': + config_file_notify => '', + } + network::mroute { 'eth0': routes => { '192.168.2.0/24' => '192.168.1.1',