diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-13 15:25:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-13 15:25:54 +0000 |
| commit | 700ad3ee5381135c21a4fddcb1d952d1607fefd0 (patch) | |
| tree | 8fe2943a5052465b8fbfba459bc90db8b3eb0f8c | |
| parent | c4e7d4dc52b9351529fac6c4979aad5fa2a4cf1e (diff) | |
| parent | c16cdec8472b8ddb22ec5fd067d731d065b0d152 (diff) | |
Merge "Ensure presence of pacemaker restart directory."
| -rw-r--r-- | manifests/pacemaker/resource_restart_flag.pp | 11 | ||||
| -rw-r--r-- | manifests/profile/base/pacemaker.pp | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/manifests/pacemaker/resource_restart_flag.pp b/manifests/pacemaker/resource_restart_flag.pp index aded802..c201c9b 100644 --- a/manifests/pacemaker/resource_restart_flag.pp +++ b/manifests/pacemaker/resource_restart_flag.pp @@ -26,10 +26,21 @@ # define tripleo::pacemaker::resource_restart_flag() { + ensure_resource('file', ['/var/lib/tripleo', '/var/lib/tripleo/pacemaker-restarts'], + { + 'ensure' => 'directory', + 'owner' => 'root', + 'mode' => '0755', + 'group' => 'root', + } + ) + exec { "${title} resource restart flag": command => "touch /var/lib/tripleo/pacemaker-restarts/${title}", path => ['/bin','/usr/bin','/sbin','/usr/sbin'], refreshonly => true, } + File['/var/lib/tripleo/pacemaker-restarts'] -> + Exec["${title} resource restart flag"] } diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp index 43edfaf..cc5fd8a 100644 --- a/manifests/profile/base/pacemaker.pp +++ b/manifests/profile/base/pacemaker.pp @@ -68,10 +68,6 @@ class tripleo::profile::base::pacemaker ( # enable stonith after all fencing devices have been created Class['tripleo::fencing'] -> Class['pacemaker::stonith'] } - - file { '/var/lib/tripleo/pacemaker-restarts': - ensure => directory, - } ~> Tripleo::Pacemaker::Resource_restart_flag<||> } if $step >= 2 { |