Merge "Include octavia::controller"

manifests/profile/base/octavia/api.pp

@@ -110,6 +110,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,
     }

manifests/profile/base/octavia/health_manager.pp

@@ -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
   }

manifests/profile/base/octavia/housekeeping.pp

@@ -29,6 +29,7 @@ class tripleo::profile::base::octavia::housekeeping (
   include ::tripleo::profile::base::octavia
 
   if $step >= 5 {
+    include ::octavia::controller
     include ::octavia::housekeeping
   }
 }

manifests/profile/base/octavia/worker.pp

@@ -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
   }