diff options
| -rw-r--r-- | manifests/profile/base/swift/storage.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/database/mysql.pp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/swift/storage.pp b/manifests/profile/base/swift/storage.pp index 5e266a9..0b09ea6 100644 --- a/manifests/profile/base/swift/storage.pp +++ b/manifests/profile/base/swift/storage.pp @@ -34,6 +34,7 @@ class tripleo::profile::base::swift::storage ( ) { if $step >= 4 { if $enable_swift_storage { + include ::swift::storage::disks include ::swift::storage::all if(!defined(File['/srv/node'])) { file { '/srv/node': diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index 529aeac..31d7d80 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -71,7 +71,7 @@ class tripleo::profile::pacemaker::database::mysql ( mysql_server_options => $mysqld_options, } - if $step >= 2 and $pacemaker_master { + if $step >= 2 { if $pacemaker_master { pacemaker::resource::ocf { 'galera' : ocf_agent_name => 'heartbeat:galera', |