From c39f49ed70dbad44c2f9c3b95046bf7823946be1 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 26 Oct 2024 01:24:38 +0900 Subject: [PATCH] Neutron: Switch use_httpd according to os family Now deploying neutron api by wsgi server mechanism is recommended, we should more actively test this scenario. Hide the flag to use this pattern also in litmus job. Change-Id: I178808488996adf1e357d21b08ae8249d84f3b0b --- fixtures/scenario001.pp | 3 --- fixtures/scenario002.pp | 3 --- fixtures/scenario003.pp | 5 +---- fixtures/scenario004.pp | 3 --- fixtures/scenario005.pp | 3 --- manifests/neutron.pp | 10 +++++----- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index ebbb51cf5..1509eb83b 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -24,12 +24,10 @@ case $facts['os']['family'] { 'Debian': { $ipv6 = false $cache_backend = 'memcached' - $neutron_use_httpd = false } 'RedHat': { $ipv6 = true $cache_backend = 'redis' - $neutron_use_httpd = true } default: { fail("Unsupported osfamily (${facts['os']['family']})") @@ -61,7 +59,6 @@ class { 'openstack_integration::glance': } class { 'openstack_integration::neutron': notification_topics => ['notifications', 'vitrage_notifications'], - use_httpd => $neutron_use_httpd, metering_enabled => true, } include openstack_integration::placement diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index b31eec85e..f38eefb9e 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -26,14 +26,12 @@ case $facts['os']['family'] { $cache_backend = 'memcached' $django_cache_backend = 'memcached' $tooz_backend = 'redis' - $neutron_use_httpd = false } 'RedHat': { $ipv6 = false $cache_backend = 'redis_sentinel' $django_cache_backend = 'redis' $tooz_backend = 'redis_sentinel' - $neutron_use_httpd = true } default: { fail("Unsupported osfamily (${facts['os']['family']})") @@ -65,7 +63,6 @@ class { 'openstack_integration::glance': image_encryption => true, } class { 'openstack_integration::neutron': - use_httpd => $neutron_use_httpd, baremetal_enabled => true, metering_enabled => true, } diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp index 80b04da65..dd2168b66 100644 --- a/fixtures/scenario003.pp +++ b/fixtures/scenario003.pp @@ -26,12 +26,10 @@ case $facts['os']['family'] { # NOTE(tkajinam): UCA Caracal does not provide trove packages # https://bugs.launchpad.net/ubuntu/+source/openstack-trove/+bug/2064838 $trove_enabled = false - $neutron_use_httpd = false } 'RedHat': { $ipv6 = true $trove_enabled = true - $neutron_use_httpd = true } default: { fail("Unsupported osfamily (${facts['os']['family']})") @@ -56,8 +54,7 @@ include openstack_integration::keystone include openstack_integration::glance class { 'openstack_integration::neutron': - use_httpd => $neutron_use_httpd, - driver => 'ovn', + driver => 'ovn', } include openstack_integration::placement class { 'openstack_integration::nova': diff --git a/fixtures/scenario004.pp b/fixtures/scenario004.pp index 654c494e0..685c8a5fd 100644 --- a/fixtures/scenario004.pp +++ b/fixtures/scenario004.pp @@ -23,7 +23,6 @@ if $facts['os']['name'] == 'Ubuntu' { case $facts['os']['family'] { 'Debian': { $ipv6 = false - $neutron_use_httpd = false # TODO(tkajinam): Need additional work to load the plugins $bgpvpn_enabled = false $l2gw_enabled = false @@ -33,7 +32,6 @@ case $facts['os']['family'] { } 'RedHat': { $ipv6 = true - $neutron_use_httpd = true $bgpvpn_enabled = true $l2gw_enabled = true $bgp_dragent_enabled = true @@ -66,7 +64,6 @@ class { 'openstack_integration::glance': } class { 'openstack_integration::neutron': - use_httpd => $neutron_use_httpd, vpnaas_enabled => $vpnaas_enabled, taas_enabled => $taas_enabled, bgpvpn_enabled => $bgpvpn_enabled, diff --git a/fixtures/scenario005.pp b/fixtures/scenario005.pp index b1fd63b46..b27545dd8 100644 --- a/fixtures/scenario005.pp +++ b/fixtures/scenario005.pp @@ -23,7 +23,6 @@ if $facts['os']['name'] == 'Ubuntu' { case $facts['os']['family'] { 'Debian': { $ipv6 = false - $neutron_use_httpd = false $ovn_metadata_agent_enabled = true $jobboard_backend = 'redis' # TODO(tkajinam): Enable these along with the other plugins @@ -31,7 +30,6 @@ case $facts['os']['family'] { } 'RedHat': { $ipv6 = true - $neutron_use_httpd = true $ovn_metadata_agent_enabled = false $jobboard_backend = 'redis_sentinel' $vpnaas_enabled = true @@ -62,7 +60,6 @@ class { 'openstack_integration::glance': show_multiple_locations => true, } class { 'openstack_integration::neutron': - use_httpd => $neutron_use_httpd, driver => 'ovn', ovn_metadata_agent_enabled => $ovn_metadata_agent_enabled, vpnaas_enabled => $vpnaas_enabled diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 8a528c5eb..37239226f 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -5,10 +5,6 @@ # Can be: openvswitch, linuxbridge or ovn. # Defaults to 'openvswitch'. # -# [*use_httpd*] -# (optional) Use httpd to run neutron api -# Defaults to false -# # [*ovn_metadata_agent_enabled*] # (optional) Enable ovn-metadata-agent # Defaults to true @@ -47,7 +43,6 @@ # class openstack_integration::neutron ( $driver = 'openvswitch', - $use_httpd = false, $ovn_metadata_agent_enabled = true, $metering_enabled = false, $vpnaas_enabled = false, @@ -59,6 +54,11 @@ class openstack_integration::neutron ( $notification_topics = $facts['os_service_default'], ) { + $use_httpd = $facts['os']['family'] ? { + 'RedHat' => true, + default => false, + } + include openstack_integration::config include openstack_integration::params