Revert "Aodh deprecation"
This reverts commitde98e1411b
. Reason for revert: Aodh service has never been deprecated in tripleo-heat-templates. The current warning in puppet-tripleo gives a wrong notice to users. Deprecation should happen in a consistent manner within all TripleO repos. Conflicts: manifests/profile/base/aodh/api.pp manifests/profile/base/aodh/evaluator.pp manifests/profile/base/aodh/listener.pp manifests/profile/base/aodh/notifier.pp Resolved conflicts caused by migration of class name format (from absolute names to relative names) Change-Id: I43eb5e96a2f15c4c49193c676acccce9c3f413c1 (cherry picked from commitbf8895796f
) (cherry picked from commit567ea3f035
)
This commit is contained in:
parent
a29d7cb11e
commit
8b631042f7
|
@ -81,7 +81,6 @@ class tripleo::profile::base::aodh::api (
|
|||
}
|
||||
|
||||
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
|
||||
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
|
||||
include aodh::api
|
||||
include tripleo::profile::base::apache
|
||||
class { 'aodh::wsgi::apache':
|
||||
|
|
|
@ -40,7 +40,6 @@ class tripleo::profile::base::aodh::evaluator (
|
|||
}
|
||||
|
||||
if $step >= 4 {
|
||||
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
|
||||
class { 'aodh::evaluator':
|
||||
coordination_url => join(['redis://:', hiera('aodh_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/', $tls_query_param]),
|
||||
}
|
||||
|
|
|
@ -30,7 +30,6 @@ class tripleo::profile::base::aodh::listener (
|
|||
include tripleo::profile::base::aodh
|
||||
|
||||
if $step >= 4 {
|
||||
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
|
||||
include aodh::listener
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@ class tripleo::profile::base::aodh::notifier (
|
|||
include tripleo::profile::base::aodh
|
||||
|
||||
if $step >= 4 {
|
||||
warning('Service aodh is deprecated. Please take in mind, that it is going to be removed in T release.')
|
||||
include aodh::notifier
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue