diff options
| -rw-r--r-- | manifests/profile/base/aodh.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/api.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/evaluator.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/listener.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/aodh/notifier.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/swift/storage.pp | 1 |
6 files changed, 6 insertions, 5 deletions
diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index 28156a0..07c0a88 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -42,7 +42,7 @@ class tripleo::profile::base::aodh ( include ::aodh::db::mysql } - if $step >= 4 and $sync_db { + if $step >= 4 or ($step >= 3 and $sync_db) { include ::aodh include ::aodh::auth include ::aodh::config diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp index 3aa436d..19ecfaf 100644 --- a/manifests/profile/base/aodh/api.pp +++ b/manifests/profile/base/aodh/api.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::api ( include ::tripleo::profile::base::aodh - if $step >= 4 and $sync_db { + if $step >= 4 { include ::aodh::api include ::aodh::wsgi::apache } diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp index 46d1d14..ca506bc 100644 --- a/manifests/profile/base/aodh/evaluator.pp +++ b/manifests/profile/base/aodh/evaluator.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::evaluator ( include ::tripleo::profile::base::aodh - if $step >= 4 and $sync_db { + if $step >= 4 { include ::aodh::evaluator } diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp index 93f37fa..57ad27f 100644 --- a/manifests/profile/base/aodh/listener.pp +++ b/manifests/profile/base/aodh/listener.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::listener ( include ::tripleo::profile::base::aodh - if $step >= 4 and $sync_db { + if $step >= 4 { include ::aodh::listener } diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp index 0686012..03a0a6f 100644 --- a/manifests/profile/base/aodh/notifier.pp +++ b/manifests/profile/base/aodh/notifier.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::aodh::notifier ( include ::tripleo::profile::base::aodh - if $step >= 4 and $sync_db { + if $step >= 4 { include ::aodh::notifier } 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': |