From f2233f019fa3b9188dd82db56cead88348c86969 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 30 Nov 2021 13:10:40 +0900 Subject: [PATCH] Use octavia::networking to manage [networking] parameters The new octavia::networking class has been added to puppet-octavia, which allows managing parameters in the [networking] section. This change ensures the class is included so that some parameters like port_detach_timeout is managed. Depends-on: https://review.opendev.org/819651 Depends-on: https://review.opendev.org/819749 Change-Id: I1c219615071cee72888feff7cea0647da86e9e11 --- manifests/profile/base/octavia.pp | 1 + spec/classes/tripleo_profile_base_octavia_spec.rb | 3 +++ 2 files changed, 4 insertions(+) diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp index 76c0d8bf7..841cb3c36 100644 --- a/manifests/profile/base/octavia.pp +++ b/manifests/profile/base/octavia.pp @@ -75,6 +75,7 @@ class tripleo::profile::base::octavia ( include octavia::config include octavia::db include octavia::logging + include octavia::networking include octavia::service_auth if $enable_driver_agent { diff --git a/spec/classes/tripleo_profile_base_octavia_spec.rb b/spec/classes/tripleo_profile_base_octavia_spec.rb index 40aa8ac19..67d52d758 100644 --- a/spec/classes/tripleo_profile_base_octavia_spec.rb +++ b/spec/classes/tripleo_profile_base_octavia_spec.rb @@ -36,6 +36,7 @@ describe 'tripleo::profile::base::octavia' do is_expected.to_not contain_class('octavia::config') is_expected.to_not contain_class('octavia::db') is_expected.to_not contain_class('octavia::logging') + is_expected.to_not contain_class('octavia::networking') is_expected.to_not contain_class('octavia::service_auth') is_expected.to_not contain_class('octavia::driver_agent') end @@ -53,6 +54,7 @@ describe 'tripleo::profile::base::octavia' do is_expected.to contain_class('octavia::config') is_expected.to contain_class('octavia::db') is_expected.to contain_class('octavia::logging') + is_expected.to contain_class('octavia::networking') is_expected.to contain_class('octavia::service_auth') is_expected.to_not contain_class('octavia::driver_agent') end @@ -136,6 +138,7 @@ describe 'tripleo::profile::base::octavia' do is_expected.to contain_class('octavia::config') is_expected.to contain_class('octavia::db') is_expected.to contain_class('octavia::logging') + is_expected.to contain_class('octavia::networking') is_expected.to contain_class('octavia::service_auth') is_expected.to contain_class('octavia::driver_agent') end