diff options
| author | Michael Scherer <misc@mageia.org> | 2012-02-09 09:10:40 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2012-02-09 09:10:40 +0000 |
| commit | af9c4c26c6379e568fa1d9e01acb4b947f5456d7 (patch) | |
| tree | acc7cd0e7067599ac963af6658df4a67fe82f0d9 /modules/puppet | |
| parent | 9a3da58e4928ddadc5dd2ba5e01dbfbbaf10d41f (diff) | |
| download | puppet-af9c4c26c6379e568fa1d9e01acb4b947f5456d7.tar puppet-af9c4c26c6379e568fa1d9e01acb4b947f5456d7.tar.gz puppet-af9c4c26c6379e568fa1d9e01acb4b947f5456d7.tar.bz2 puppet-af9c4c26c6379e568fa1d9e01acb4b947f5456d7.tar.xz puppet-af9c4c26c6379e568fa1d9e01acb4b947f5456d7.zip | |
clean now we no longer use mandriva on puppet master
Diffstat (limited to 'modules/puppet')
| -rw-r--r-- | modules/puppet/manifests/init.pp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index a6dfe958..94aa7009 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -24,13 +24,8 @@ class puppet { class master { include puppet::client - # for stored config - $rails_package = $lsbdistid ? { - Mageia => "ruby-rails", - MandrivaLinux => "rails" - } - - package { ["ruby-sqlite3", "puppet-server", $rails_package]: } + # rails and sqlite3 are used for stored config + package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: } service { puppetmaster: subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] |