diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 12:28:24 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 12:33:05 +0100 |
commit | 2499f7e73946cd5147a1158b48ebe4b06e4e530d (patch) | |
tree | b1435c23f21afee1a8d150d0d96da40070916fc5 /modules/base_installation/manifests | |
parent | 85abd2fdbad83430df4824843764719064afb9b4 (diff) | |
download | Puppet-2499f7e73946cd5147a1158b48ebe4b06e4e530d.tar.gz Puppet-2499f7e73946cd5147a1158b48ebe4b06e4e530d.tar.zst Puppet-2499f7e73946cd5147a1158b48ebe4b06e4e530d.zip |
Add helpers and remove logs from cronie
Diffstat (limited to 'modules/base_installation/manifests')
-rw-r--r-- | modules/base_installation/manifests/cronie.pp | 4 | ||||
-rw-r--r-- | modules/base_installation/manifests/puppet.pp | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/modules/base_installation/manifests/cronie.pp b/modules/base_installation/manifests/cronie.pp index 4df0e37..72f2d8f 100644 --- a/modules/base_installation/manifests/cronie.pp +++ b/modules/base_installation/manifests/cronie.pp | |||
@@ -19,13 +19,13 @@ class base_installation::cronie inherits base_installation { | |||
19 | } | 19 | } |
20 | cron { 'puppet-apply': | 20 | cron { 'puppet-apply': |
21 | ensure => present, | 21 | ensure => present, |
22 | command => "cd $base_installation::puppet_code_path ; puppet apply --test $base_installation::puppet_code_path/manifests/site.pp", | 22 | command => "cd $base_installation::puppet_code_path ; puppet apply $base_installation::puppet_code_path/manifests/site.pp", |
23 | user => root, | 23 | user => root, |
24 | minute => '*/20' | 24 | minute => '*/20' |
25 | } | 25 | } |
26 | cron { 'puppet-apply-reboot': | 26 | cron { 'puppet-apply-reboot': |
27 | ensure => present, | 27 | ensure => present, |
28 | command => "cd $base_installation::puppet_code_path ; puppet apply --test $base_installation::puppet_code_path/manifests/site.pp", | 28 | command => "cd $base_installation::puppet_code_path ; puppet apply $base_installation::puppet_code_path/manifests/site.pp", |
29 | user => root, | 29 | user => root, |
30 | special => "reboot" | 30 | special => "reboot" |
31 | } | 31 | } |
diff --git a/modules/base_installation/manifests/puppet.pp b/modules/base_installation/manifests/puppet.pp index a8dc641..b3ce492 100644 --- a/modules/base_installation/manifests/puppet.pp +++ b/modules/base_installation/manifests/puppet.pp | |||
@@ -27,6 +27,18 @@ class base_installation::puppet ( | |||
27 | } | 27 | } |
28 | ### | 28 | ### |
29 | 29 | ||
30 | file { '/usr/local/sbin/i_puppet_reset_and_apply': | ||
31 | mode => "0755", | ||
32 | ensure => present, | ||
33 | source => "puppet:///modules/base_installation/scripts/puppet_reset_and_apply" | ||
34 | } | ||
35 | |||
36 | file { '/usr/local/sbin/i_puppet_report_print': | ||
37 | mode => "0755", | ||
38 | ensure => present, | ||
39 | source => "puppet:///modules/base_installation/scripts/report_print.rb" | ||
40 | } | ||
41 | |||
30 | unless empty(find_file($password_seed)) { | 42 | unless empty(find_file($password_seed)) { |
31 | $ldap_password = generate_password(24, $password_seed, "ldap") | 43 | $ldap_password = generate_password(24, $password_seed, "ldap") |
32 | $ssha_ldap_seed = generate_password(5, $password_seed, "ldap_seed") | 44 | $ssha_ldap_seed = generate_password(5, $password_seed, "ldap_seed") |