Start to cleanup the files

[perso/Immae/Projets/Puppet.git] / modules / base_installation / manifests / puppet.pp

diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp
index cd5697ac5bf783e069705e1dbd2bc284cfb01291..6f7732dfed2b83c63cdbd62cd13233c5af2d87ff 100644 (file)
--- a/modules/base_installation/manifests/puppet.pp
+++ b/modules/base_installation/manifests/puppet.pp
@@ -13,6 +13,32 @@ class base_installation::puppet (
     environment => "RANDFILE=/dev/null",
   }
 
+  ### Until puppet fixes hist gettext-setup gem use
+  package { 'gem:gettext-setup':
+    name            => "gettext-setup",
+    ensure          => present,
+    provider        => "gem",
+    install_options => "--no-user-install"
+  }
+
+  file { '/usr/lib/ruby/vendor_ruby/locales/':
+    ensure => link,
+    target => "/opt/puppetlabs/puppet/share/locale/",
+  }
+  ###
+
+  file { '/usr/local/sbin/i_puppet_reset_and_apply':
+    mode   => "0755",
+    ensure => present,
+    source => "puppet:///modules/base_installation/scripts/puppet_reset_and_apply"
+  }
+
+  file { '/usr/local/sbin/i_puppet_report_print':
+    mode   => "0755",
+    ensure => present,
+    source => "puppet:///modules/base_installation/scripts/report_print.rb"
+  }
+
   unless empty(find_file($password_seed)) {
     $ldap_password = generate_password(24, $password_seed, "ldap")
     $ssha_ldap_seed = generate_password(5, $password_seed, "ldap_seed")
@@ -41,6 +67,7 @@ class base_installation::puppet (
       require => File[$base_installation::puppet_conf_path],
     }
 
+    $ips = lookup("ips", { 'default_value' => undef })
     file { "$base_installation::puppet_conf_path/host_ldap.info":
       content => template("base_installation/puppet/host_ldap.info.erb"),
       require => File[$base_installation::puppet_conf_path],