Include octavia::controller
Commits https://review.openstack.org/#/c/612395/ and
https://review.openstack.org/#/c/619013/ deprecated some
parameters in class octavia::worker and moved them to the new class
octavia::controller. The latter commit also removed the include of the
controller class so because of that we have to include it in the Octavia
services manifest files in puppet-tripleo.
Partial-Bug: #1805345
Change-Id: I0256e125de367615c21343683ed5311521d8337c
(cherry picked from commit 43ffaed334
)
This commit is contained in:
parent
19c97f0b2e
commit
fbbca5c0ac
|
@ -43,6 +43,7 @@ class tripleo::profile::base::octavia::api (
|
|||
# it will try to populate tables and we need to make sure this happens
|
||||
# before it starts on other nodes
|
||||
if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
|
||||
include ::octavia::controller
|
||||
class { '::octavia::api':
|
||||
sync_db => $sync_db,
|
||||
}
|
||||
|
|
|
@ -28,6 +28,7 @@ class tripleo::profile::base::octavia::health_manager (
|
|||
) {
|
||||
include ::tripleo::profile::base::octavia
|
||||
if $step >= 5 {
|
||||
include ::octavia::controller
|
||||
include ::octavia::health_manager
|
||||
include ::octavia::certificates
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@ class tripleo::profile::base::octavia::housekeeping (
|
|||
include ::tripleo::profile::base::octavia
|
||||
|
||||
if $step >= 5 {
|
||||
include ::octavia::controller
|
||||
include ::octavia::housekeeping
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@ class tripleo::profile::base::octavia::worker (
|
|||
include ::tripleo::profile::base::octavia
|
||||
|
||||
if $step >= 5 {
|
||||
include ::octavia::controller
|
||||
include ::octavia::worker
|
||||
include ::octavia::certificates
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue