openstack
/
puppet-tripleo
Code Issues Proposed changes

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
(cherry picked from commit 501522bf52)
This commit is contained in:
Gregory Thiemonge 2021-12-07 09:35:13 +01:00
parent c7b0fe6cb1
commit aacd61c4f6
6 changed files with 267 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/octavia/health_manager.pp
View File

@ -35,5 +35,6 @@ class tripleo::profile::base::octavia::health_manager (
include octavia::neutron
include octavia::glance
include octavia::cinder
include octavia::task_flow
}
}

1
manifests/profile/base/octavia/housekeeping.pp
View File

@ -36,5 +36,6 @@ class tripleo::profile::base::octavia::housekeeping (
include octavia::neutron
include octavia::glance
include octavia::cinder
include octavia::task_flow
}
}

1
manifests/profile/base/octavia/worker.pp
View File

@ -36,5 +36,6 @@ class tripleo::profile::base::octavia::worker (
include octavia::neutron
include octavia::glance
include octavia::cinder
include octavia::task_flow
}
}

88
spec/classes/tripleo_profile_base_octavia_health_manager_spec.rb Normal file
View File

@ -0,0 +1,88 @@
<<<<<<< HEAD (c7b0fe wallaby only: Pin external modules)
=======
#
# Copyright (C) 2021 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::octavia::health_manager' do
let :params do
{ :step => 5 }
end
shared_examples_for 'tripleo::profile::base::octavia::health_manager' do
before :each do
facts.merge!({ :step => params[:step] })
end
let(:pre_condition) do
<<-eos
class { 'tripleo::profile::base::octavia' :
step => #{params[:step]},
oslomsg_rpc_username => 'bugs',
oslomsg_rpc_password => 'rabbits_R_c00l',
oslomsg_rpc_hosts => ['hole.field.com']
}
eos
end
context 'with step less than 5' do
before do
params.merge!({ :step => 4 })
end
it 'should not do anything' do
is_expected.to_not contain_class('octavia::controller')
is_expected.to_not contain_class('octavia::nova')
is_expected.to_not contain_class('octavia::health_manager')
is_expected.to_not contain_class('octavia::certificates')
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
context 'with step 5' do
before do
params.merge!({ :step => 5 })
end
it 'should do the full configuration' do
is_expected.to contain_class('octavia::controller')
is_expected.to contain_class('octavia::nova')
is_expected.to contain_class('octavia::health_manager')
is_expected.to contain_class('octavia::certificates')
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
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
it_behaves_like 'tripleo::profile::base::octavia::health_manager'
end
end
end
>>>>>>> CHANGE (501522 Include octavia task_flow manifest for octavia services)

88
spec/classes/tripleo_profile_base_octavia_housekeeping_spec.rb Normal file
View File

@ -0,0 +1,88 @@
<<<<<<< HEAD (c7b0fe wallaby only: Pin external modules)
=======
#
# Copyright (C) 2021 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::octavia::housekeeping' do
let :params do
{ :step => 5 }
end
shared_examples_for 'tripleo::profile::base::octavia::housekeeping' do
before :each do
facts.merge!({ :step => params[:step] })
end
let(:pre_condition) do
<<-eos
class { 'tripleo::profile::base::octavia' :
step => #{params[:step]},
oslomsg_rpc_username => 'bugs',
oslomsg_rpc_password => 'rabbits_R_c00l',
oslomsg_rpc_hosts => ['hole.field.com']
}
eos
end
context 'with step less than 5' do
before do
params.merge!({ :step => 4 })
end
it 'should not do anything' do
is_expected.to_not contain_class('octavia::controller')
is_expected.to_not contain_class('octavia::nova')
is_expected.to_not contain_class('octavia::housekeeping')
is_expected.to_not contain_class('octavia::certificates')
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
context 'with step 5' do
before do
params.merge!({ :step => 5 })
end
it 'should do the full configuration' do
is_expected.to contain_class('octavia::controller')
is_expected.to contain_class('octavia::nova')
is_expected.to contain_class('octavia::housekeeping')
is_expected.to contain_class('octavia::certificates')
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
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
it_behaves_like 'tripleo::profile::base::octavia::housekeeping'
end
end
end
>>>>>>> CHANGE (501522 Include octavia task_flow manifest for octavia services)

88
spec/classes/tripleo_profile_base_octavia_worker_spec.rb Normal file
View File

@ -0,0 +1,88 @@
<<<<<<< HEAD (c7b0fe wallaby only: Pin external modules)
=======
#
# Copyright (C) 2021 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::octavia::worker' do
let :params do
{ :step => 5 }
end
shared_examples_for 'tripleo::profile::base::octavia::worker' do
before :each do
facts.merge!({ :step => params[:step] })
end
let(:pre_condition) do
<<-eos
class { 'tripleo::profile::base::octavia' :
step => #{params[:step]},
oslomsg_rpc_username => 'bugs',
oslomsg_rpc_password => 'rabbits_R_c00l',
oslomsg_rpc_hosts => ['hole.field.com']
}
eos
end
context 'with step less than 5' do
before do
params.merge!({ :step => 4 })
end
it 'should not do anything' do
is_expected.to_not contain_class('octavia::controller')
is_expected.to_not contain_class('octavia::nova')
is_expected.to_not contain_class('octavia::worker')
is_expected.to_not contain_class('octavia::certificates')
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
context 'with step 5' do
before do
params.merge!({ :step => 5 })
end
it 'should do the full configuration' do
is_expected.to contain_class('octavia::controller')
is_expected.to contain_class('octavia::nova')
is_expected.to contain_class('octavia::worker')
is_expected.to contain_class('octavia::certificates')
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
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({})
end
it_behaves_like 'tripleo::profile::base::octavia::worker'
end
end
end
>>>>>>> CHANGE (501522 Include octavia task_flow manifest for octavia services)