From 501522bf52c17ac029ba66d95f54331933cde3d7 Mon Sep 17 00:00:00 2001
From: Gregory Thiemonge <gthiemon@redhat.com>
Date: Tue, 7 Dec 2021 09:35:13 +0100
Subject: [PATCH] Include octavia task_flow manifest for octavia services

The Octavia worker, housekeeping and health-manager services should
include the task_flow manifest to configure jobboard persistence in
Octavia.

Depends-On: https://review.opendev.org/c/openstack/puppet-octavia/+/816434

Change-Id: I2d8338d64b3f9887fdd067c820b10baab8eb0446
---
 manifests/profile/base/octavia/health_manager.pp                | 1 +
 manifests/profile/base/octavia/housekeeping.pp                  | 1 +
 manifests/profile/base/octavia/worker.pp                        | 1 +
 .../classes/tripleo_profile_base_octavia_health_manager_spec.rb | 2 ++
 spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb  | 2 ++
 spec/classes/tripleo_profile_base_octavia_worker_spec.rb        | 2 ++
 6 files changed, 9 insertions(+)

diff --git a/manifests/profile/base/octavia/health_manager.pp b/manifests/profile/base/octavia/health_manager.pp
index d9499712b..ddcb591a7 100644
--- a/manifests/profile/base/octavia/health_manager.pp
+++ b/manifests/profile/base/octavia/health_manager.pp
@@ -35,5 +35,6 @@ class tripleo::profile::base::octavia::health_manager (
     include octavia::neutron
     include octavia::glance
     include octavia::cinder
+    include octavia::task_flow
   }
 }
diff --git a/manifests/profile/base/octavia/housekeeping.pp b/manifests/profile/base/octavia/housekeeping.pp
index 853dcab68..d3cda63aa 100644
--- a/manifests/profile/base/octavia/housekeeping.pp
+++ b/manifests/profile/base/octavia/housekeeping.pp
@@ -36,5 +36,6 @@ class tripleo::profile::base::octavia::housekeeping (
     include octavia::neutron
     include octavia::glance
     include octavia::cinder
+    include octavia::task_flow
   }
 }
diff --git a/manifests/profile/base/octavia/worker.pp b/manifests/profile/base/octavia/worker.pp
index ed6dcc75a..de2e4fb1b 100644
--- a/manifests/profile/base/octavia/worker.pp
+++ b/manifests/profile/base/octavia/worker.pp
@@ -36,5 +36,6 @@ class tripleo::profile::base::octavia::worker (
     include octavia::neutron
     include octavia::glance
     include octavia::cinder
+    include octavia::task_flow
   }
 }
diff --git a/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb b/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
index fc5146af5..32934bcbb 100644
--- a/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb
@@ -52,6 +52,7 @@ eos
         is_expected.to_not contain_class('octavia::neutron')
         is_expected.to_not contain_class('octavia::glance')
         is_expected.to_not contain_class('octavia::cinder')
+        is_expected.to_not contain_class('octavia::task_flow')
       end
     end
 
@@ -68,6 +69,7 @@ eos
         is_expected.to contain_class('octavia::neutron')
         is_expected.to contain_class('octavia::glance')
         is_expected.to contain_class('octavia::cinder')
+        is_expected.to contain_class('octavia::task_flow')
       end
     end
   end
diff --git a/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb b/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
index bda852427..18e906aaa 100644
--- a/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb
@@ -52,6 +52,7 @@ eos
         is_expected.to_not contain_class('octavia::neutron')
         is_expected.to_not contain_class('octavia::glance')
         is_expected.to_not contain_class('octavia::cinder')
+        is_expected.to_not contain_class('octavia::task_flow')
       end
     end
 
@@ -68,6 +69,7 @@ eos
         is_expected.to contain_class('octavia::neutron')
         is_expected.to contain_class('octavia::glance')
         is_expected.to contain_class('octavia::cinder')
+        is_expected.to contain_class('octavia::task_flow')
       end
     end
   end
diff --git a/spec/classes/tripleo_profile_base_octavia_worker_spec.rb b/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
index d7ece7540..ad2502bfe 100644
--- a/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
+++ b/spec/classes/tripleo_profile_base_octavia_worker_spec.rb
@@ -52,6 +52,7 @@ eos
         is_expected.to_not contain_class('octavia::neutron')
         is_expected.to_not contain_class('octavia::glance')
         is_expected.to_not contain_class('octavia::cinder')
+        is_expected.to_not contain_class('octavia::task_flow')
       end
     end
 
@@ -68,6 +69,7 @@ eos
         is_expected.to contain_class('octavia::neutron')
         is_expected.to contain_class('octavia::glance')
         is_expected.to contain_class('octavia::cinder')
+        is_expected.to contain_class('octavia::task_flow')
       end
     end
   end