From 126d20f07601b112eba2230558ac1dcd05fe7f54 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 4 Feb 2024 21:07:24 +0900 Subject: [PATCH] octavia: Enable jobboard settings Octavia introduced the jobboard driver for amphora v2. Although we are using noop drivers in our CI at this moment, we can enable the feature for testing. Depends-on: https://review.opendev.org/907685 Change-Id: I4789a9b6aa289cf6926931bf82dab5b5dd02fa8f --- README.md | 2 +- fixtures/scenario004.pp | 1 + fixtures/scenario005.pp | 1 + manifests/octavia.pp | 30 ++++++++++++++++++++++++++---- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 36718f4b8..56d4c79d5 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ scenario](#all-in-one). | taas | | | | X | | | | bgpvpn-api | | | | X | | | | bgp-dr | | | | X | | | -| redis | X | X | X | | | | +| redis | X | X | X | X | X | | | l2gw | | | | X | | | | octavia | | | | X | X | | | om rpc | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index 40bc174ae..bd9b3931d 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -53,6 +53,7 @@ include openstack_integration::apache include openstack_integration::memcached include openstack_integration::rabbitmq include openstack_integration::mysql +include openstack_integration::redis include openstack_integration::keystone class { 'openstack_integration::glance': backend => 'swift', diff --git a/fixtures/scenario005.pp b/fixtures/scenario005.pp index c66f4b5d2..2850bb1f7 100644 --- a/fixtures/scenario005.pp +++ b/fixtures/scenario005.pp @@ -46,6 +46,7 @@ include openstack_integration::apache include openstack_integration::memcached include openstack_integration::rabbitmq include openstack_integration::mysql +include openstack_integration::redis include openstack_integration::ovn include openstack_integration::keystone include openstack_integration::cinder diff --git a/manifests/octavia.pp b/manifests/octavia.pp index 99b6ada12..3629728a2 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -70,11 +70,14 @@ class openstack_integration::octavia ( notification_driver => 'messagingv2', } class { 'octavia::db::mysql': - charset => $::openstack_integration::params::mysql_charset, - collate => $::openstack_integration::params::mysql_collate, - password => 'octavia', - host => $::openstack_integration::config::host, + charset => $::openstack_integration::params::mysql_charset, + collate => $::openstack_integration::params::mysql_collate, + password => 'octavia', + host => $::openstack_integration::config::host, + persistence_dbname => 'octavia_persistence', } + class { 'octavia::db::sync': } + class { 'octavia::db::sync_persistence': } class { 'octavia::keystone::auth': public_url => "${::openstack_integration::config::base_url}:9876", internal_url => "${::openstack_integration::config::base_url}:9876", @@ -179,6 +182,25 @@ class openstack_integration::octavia ( heartbeat_key => 'abcdefghijkl', } + class { 'octavia::task_flow': + max_workers => 2, + persistence_connection => os_database_connection({ + 'dialect' => 'mysql+pymysql', + 'host' => $::openstack_integration::config::ip_for_url, + 'username' => 'octavia', + 'password' => 'octavia', + 'database' => 'octavia_persistence', + 'charset' => 'utf8', + 'extra' => $::openstack_integration::config::db_extra, + }), + jobboard_enabled => true, + jobboard_backend_hosts => $::openstack_integration::config::host, + jobboard_backend_port => 6379, + jobboard_backend_password => 'a_big_secret', + jobboard_redis_backend_ssl_options => { + 'ssl' => $::openstack_integration::config::ssl + }, + } class { 'octavia::worker': workers => 2, }