diff options
Diffstat (limited to 'modules/base_installation/manifests')
-rw-r--r-- | modules/base_installation/manifests/puppet.pp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp index 0cb43bc..c64ddfd 100644 --- a/modules/base_installation/manifests/puppet.pp +++ b/modules/base_installation/manifests/puppet.pp | |||
@@ -56,23 +56,39 @@ class base_installation::puppet ( | |||
56 | install_options => "--no-user-install" | 56 | install_options => "--no-user-install" |
57 | } | 57 | } |
58 | 58 | ||
59 | package { 'gem:xmpp4r': | ||
60 | name => "xmpp4r", | ||
61 | ensure => present, | ||
62 | provider => "gem", | ||
63 | install_options => "--no-user-install" | ||
64 | } | ||
65 | |||
59 | file { $password_seed: | 66 | file { $password_seed: |
60 | mode => "0600", | 67 | mode => "0600", |
61 | } | 68 | } |
62 | 69 | ||
63 | file { $base_installation::puppet_conf_path: | 70 | file { $base_installation::puppet_conf_path: |
64 | ensure => directory, | 71 | ensure => directory, |
65 | require => [Package["puppet"], Package["gem:ruby-ldap"]], | 72 | require => [Package["puppet"], Package["gem:xmpp4r"], Package["gem:ruby-ldap"]], |
66 | recurse => true, | 73 | recurse => true, |
67 | purge => true, | 74 | purge => true, |
68 | force => true, | 75 | force => true, |
69 | } | 76 | } |
70 | 77 | ||
78 | $xmpp = lookup("base_installation::notify_xmpp", { "default_value" => {} }) | ||
79 | |||
71 | file { "$base_installation::puppet_conf_path/puppet.conf": | 80 | file { "$base_installation::puppet_conf_path/puppet.conf": |
72 | content => template("base_installation/puppet/puppet.conf.erb"), | 81 | content => template("base_installation/puppet/puppet.conf.erb"), |
73 | require => File[$base_installation::puppet_conf_path], | 82 | require => File[$base_installation::puppet_conf_path], |
74 | } | 83 | } |
75 | 84 | ||
85 | unless empty($xmpp) { | ||
86 | file { "$base_installation::puppet_conf_path/xmpp.yaml": | ||
87 | content => template("base_installation/puppet/xmpp.yaml.erb"), | ||
88 | require => File[$base_installation::puppet_conf_path], | ||
89 | } | ||
90 | } | ||
91 | |||
76 | $ips = lookup("ips", { 'default_value' => undef }) | 92 | $ips = lookup("ips", { 'default_value' => undef }) |
77 | file { "$base_installation::puppet_conf_path/host_ldap.info": | 93 | file { "$base_installation::puppet_conf_path/host_ldap.info": |
78 | content => template("base_installation/puppet/host_ldap.info.erb"), | 94 | content => template("base_installation/puppet/host_ldap.info.erb"), |