diff options
| author |   Sofer Athlan-Guyot <sathlang@redhat.com> | 2016-10-11 10:18:16 +0200 |
|---|---|---|
| committer | Sofer Athlan-Guyot <sathlang@redhat.com> | 2016-10-13 13:44:05 +0200 |
| commit | c16cdec8472b8ddb22ec5fd067d731d065b0d152 (patch) | |
| tree | 1fadfd6d897475a2f0d7b7608e142b4c4d82dbe0 | |
| parent | 000c633a50efb45c535cd346a7eade040172293b (diff) | |
Ensure presence of pacemaker restart directory.
Currently the /var/lib/tripleo/pacemaker-restarts directory is created
only when base/pacemaker.pp file is included in the manifest. There is a
notification that ensures precedence order and trigger the touch.
The trigger and the dependency on the base/pacemaker.pp should not be
required as someone using the tripleo::pacemaker::resource_restart_flag
would expect the file to be created no matter what.
For instance in the Cinder upgrade in the convergence step has this
defined:
Cinder_config<||> ~> Tripleo::Pacemaker::Resource_restart_flag["${::cinder::params::volume_service}"]
but in the convergence step, the base/pacemaker.pp is not included and
the above trigger fails as the directory is not created.
It looks the same for manilla.pp.
This patch removes the trigger and ensures the directory is created when
needed.
Change-Id: Ic3aa82c818662e9e88e21c8381d657adef5b43ac
Closes-Bug: #1632232
| -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 { |