diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-17 12:29:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-17 12:29:13 +0000 |
| commit | 85d8f49217a3b568220d54b976c1ea9dac940b1d (patch) | |
| tree | ef4be303569d9472777b4f2b4eb34073e8f307dd /manifests | |
| parent | a805daefd18779f6a97e0c6ea165633a602fb616 (diff) | |
| parent | 65ea36f60e2f12e258babc86b83fe7a28ee870a4 (diff) | |
Merge "Fix deployment steps for AODH profiles"
Diffstat (limited to 'manifests')
| -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 |
5 files changed, 5 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 } |