From 6a9026be6bde21d7db98f5009121d26c6477a4b9 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Sun, 6 Feb 2011 10:14:59 -0500 Subject: [PATCH 1/8] Added jdk and stomp for mc --- localrepo.pp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/localrepo.pp b/localrepo.pp index d11da55..e437e8b 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -96,7 +96,7 @@ } pkgsync { "base_pkgs": - pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\n", + pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\n", repopath => "${base}/mirror/centos/5/os/i386", source => "::centos/5/os/i386/CentOS/", notify => Repobuild["base_local"] @@ -104,6 +104,7 @@ repobuild { "base_local": repopath => "${base}/mirror/centos/5/os/i386", + notify => Exec["makecache"], } pkgsync { "updates_pkgs": @@ -115,10 +116,11 @@ repobuild { "updates_local": repopath => "${base}/mirror/centos/5/updates/i386", + notify => Exec["makecache"], } pkgsync { "epel_pkgs": - pkglist => "rubygems*\nrubygem-rake*\nruby-RRDtool*\nrrdtool-ruby*\nrubygem-sqlite3-ruby*\nrubygem-rails*\nrubygem-activesupport*\nrubygem-actionmailer*\nrubygem-activeresource*\nrubygem-actionpack*\nrubygem-activerecord*\nmysql*\nruby-mysql*\nrubygem-rspec*\n", + pkglist => "rubygems*\nrubygem-rake*\nruby-RRDtool*\nrrdtool-ruby*\nrubygem-sqlite3-ruby*\nrubygem-rails*\nrubygem-activesupport*\nrubygem-actionmailer*\nrubygem-activeresource*\nrubygem-actionpack*\nrubygem-activerecord*\nmysql*\nruby-mysql*\nrubygem-rspec*\nrubygem-stomp*\n", repopath => "${base}/mirror/epel/5/local/i386", source => "::fedora-epel/5/i386/", notify => Repobuild["epel_local"] @@ -126,6 +128,7 @@ repobuild { "epel_local": repopath => "${base}/mirror/epel/5/local/i386", + notify => Exec["makecache"], } pkgsync { "puppetlabs_pkgs": @@ -138,8 +141,16 @@ repobuild { "puppetlabs_local": repopath => "${base}/mirror/puppetlabs/local/base/i386", + notify => Exec["makecache"], } + exec { "makecache": + command => "yum makecache", + path => "/usr/bin", + refreshonly => true, + user => root, + group => root, + } } include localpm From 397e2a7c608b45eb514e3c4340bdf4f4d5fcb2e2 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Wed, 9 Feb 2011 16:26:18 -0800 Subject: [PATCH 2/8] Adding java deps --- localrepo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localrepo.pp b/localrepo.pp index e437e8b..fbd579a 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -96,7 +96,7 @@ } pkgsync { "base_pkgs": - pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\n", + pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\nalsa-lib*\ngiflib*\njpackage-utils*\nlibXtst", repopath => "${base}/mirror/centos/5/os/i386", source => "::centos/5/os/i386/CentOS/", notify => Repobuild["base_local"] From f9ec65d71e0fa262244f801a65aa60e1545162aa Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Wed, 9 Feb 2011 16:42:22 -0800 Subject: [PATCH 3/8] Forgot *\n --- localrepo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localrepo.pp b/localrepo.pp index fbd579a..4ec0628 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -96,7 +96,7 @@ } pkgsync { "base_pkgs": - pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\nalsa-lib*\ngiflib*\njpackage-utils*\nlibXtst", + pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\nalsa-lib*\ngiflib*\njpackage-utils*\nlibXtst*\n", repopath => "${base}/mirror/centos/5/os/i386", source => "::centos/5/os/i386/CentOS/", notify => Repobuild["base_local"] From 120cd64d4fc8b2907174b91fb14fdaf9670e9819 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Thu, 10 Feb 2011 10:50:55 -0800 Subject: [PATCH 4/8] Adding mcollective packages --- localrepo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localrepo.pp b/localrepo.pp index 4ec0628..49678ef 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -132,7 +132,7 @@ } pkgsync { "puppetlabs_pkgs": - pkglist => "puppet-dashboard*\n", + pkglist => "puppet-dashboard*\nmcollective-common*\nmcollective-client*\nmcollective*\n", repopath => "${base}/mirror/puppetlabs/local/base/i386", source => "::packages/yum/base/", server => "yum.puppetlabs.com", From 5529d96191f4ad7ef5cfb407182589ff309bfdda Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Feb 2011 21:48:34 -0500 Subject: [PATCH 5/8] changes in support of #6340. added updates for PE installer dev option. added runlocalrepo.sh that runs localrepo.pp with a certain installation of Puppet. --- localrepo.pp | 4 ++-- runlocalrepo.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100755 runlocalrepo.sh diff --git a/localrepo.pp b/localrepo.pp index 49678ef..48d316b 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -108,7 +108,7 @@ } pkgsync { "updates_pkgs": - pkglist => "mysql*\npostgresql-libs*\n", + pkglist => "kernel-headers*\nlibgomp*\ncpp*\ngcc*\nglibc*\nmysql*\npostgresql-libs*\n", repopath => "${base}/mirror/centos/5/updates/i386", source => "::centos/5/updates/i386/RPMS/", notify => Repobuild["updates_local"] @@ -132,7 +132,7 @@ } pkgsync { "puppetlabs_pkgs": - pkglist => "puppet-dashboard*\nmcollective-common*\nmcollective-client*\nmcollective*\n", + pkglist => "mcollective-common*\nmcollective-client*\nmcollective*\n", repopath => "${base}/mirror/puppetlabs/local/base/i386", source => "::packages/yum/base/", server => "yum.puppetlabs.com", diff --git a/runlocalrepo.sh b/runlocalrepo.sh new file mode 100755 index 0000000..db8d4a7 --- /dev/null +++ b/runlocalrepo.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# set up local Puppet environment to +# run localrepo.pp +# +PUPPET_HOME=/opt/puppetlabs/puppet +export RUBYLIB=$PUPPET_HOME/lib +export PATH=$PUPPET_HOME/bin/:$PUPET_HOME/sbin/:$PATH +puppet apply localrepo.pp From b401a3b1172b4eb6be0f066550f8f9c246eac208 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Feb 2011 23:21:47 -0500 Subject: [PATCH 6/8] added code to create /etc/puppet{modules,manifests/site.pp} --- localrepo.pp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/localrepo.pp b/localrepo.pp index 48d316b..52fc507 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -154,3 +154,16 @@ } include localpm + +class puppetbase { + # do some basic puppet setup + file {['/etc/puppet/', '/etc/puppet/modules/', '/etc/puppet/manifests/']: + ensure => directory + } + file {'/etc/puppet/manifests/site.pp': + content => '' + } + # TODO - install our maintenance version of Puppet using vcsrepo +} + +include puppetbase From 060bc4b5bc2ca1de25141c19d0afba425078fbb8 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 8 Feb 2011 00:04:38 -0500 Subject: [PATCH 7/8] changed localrepo to put puppet files in the pe location --- localrepo.pp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/localrepo.pp b/localrepo.pp index 52fc507..228e8c4 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -157,10 +157,12 @@ class puppetbase { # do some basic puppet setup - file {['/etc/puppet/', '/etc/puppet/modules/', '/etc/puppet/manifests/']: + file {['/etc/puppetlabs/', '/etc/puppetlabs/puppet/', + '/etc/puppetlabs/puppet/modules', '/etc/puppetlabs/puppet/manifests' + ]: ensure => directory } - file {'/etc/puppet/manifests/site.pp': + file {'/etc/puppetlabs/puppet/manifests/site.pp': content => '' } # TODO - install our maintenance version of Puppet using vcsrepo From 45a5bb31394abadb8bd410f627e540d92ef40aab Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Feb 2011 18:50:40 -0500 Subject: [PATCH 8/8] added more repos to clone for the wordpress demo. --- localrepo.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/localrepo.pp b/localrepo.pp index 228e8c4..2bcc120 100644 --- a/localrepo.pp +++ b/localrepo.pp @@ -96,7 +96,7 @@ } pkgsync { "base_pkgs": - pkglist => "httpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\nalsa-lib*\ngiflib*\njpackage-utils*\nlibXtst*\n", + pkglist => "perl-URI*\nsubversion*\nneon*\ngmp*\nhttpd*\nperl-DBI*\nlibart_lgpl*\napr*\nruby-rdoc*\nntp*\nbluez-libs*\nbluez-utils*\nperl-DBD-MySQL*\nruby-ri*\nruby-irb*\nscreen*\nemacs*\nvim*\nemacs-nox*\njava-1.6.0-openjdk*\nalsa-lib*\ngiflib*\njpackage-utils*\nlibXtst*\n", repopath => "${base}/mirror/centos/5/os/i386", source => "::centos/5/os/i386/CentOS/", notify => Repobuild["base_local"] @@ -108,7 +108,7 @@ } pkgsync { "updates_pkgs": - pkglist => "kernel-headers*\nlibgomp*\ncpp*\ngcc*\nglibc*\nmysql*\npostgresql-libs*\n", + pkglist => "php*\nkernel-headers*\nlibgomp*\ncpp*\ngcc*\nglibc*\nmysql*\npostgresql-libs*\n", repopath => "${base}/mirror/centos/5/updates/i386", source => "::centos/5/updates/i386/RPMS/", notify => Repobuild["updates_local"]