openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Move distro speicfic logic to params"

This commit is contained in:
Zuul 2024-01-09 17:29:26 +00:00 committed by Gerrit Code Review
parent 659e683efa 10a6fe1ec9
commit 37cafeb79b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agents/ml2/ovs.pp
View File

@ -573,7 +573,7 @@ class neutron::agents::ml2::ovs (
}
Neutron_agent_ovs<||> ~> Service['neutron-ovs-agent-service']
if ($facts['os']['family'] == 'Redhat') {
if $::neutron::params::destroy_patch_ports_service {
# NOTE(tkajinam): The service should not be started in a running system.
# DO NOT define ensure so the service status is not
# changed.

3
manifests/params.pp
View File

@ -7,7 +7,6 @@ class neutron::params {
$client_package = 'python3-neutronclient'
$ovs_agent_service = 'neutron-openvswitch-agent'
$destroy_patch_ports_service = 'neutron-destroy-patch-ports'
$linuxbridge_agent_service = 'neutron-linuxbridge-agent'
$macvtap_agent_service = 'neutron-macvtap-agent'
$opencontrail_plugin_package = 'neutron-plugin-contrail'
@ -38,6 +37,7 @@ class neutron::params {
$ml2_server_package = 'openstack-neutron-ml2'
$ovs_agent_package = 'openstack-neutron-openvswitch'
$ovs_cleanup_service = 'neutron-ovs-cleanup'
$destroy_patch_ports_service = 'neutron-destroy-patch-ports'
$linuxbridge_agent_package = 'openstack-neutron-linuxbridge'
$sriov_nic_agent_service = 'neutron-sriov-nic-agent'
$sriov_nic_agent_package = 'openstack-neutron-sriov-nic-agent'
@ -95,6 +95,7 @@ class neutron::params {
$bgpvpn_bagpipe_package = 'python3-networking-bagpipe'
$ovs_agent_package = 'neutron-openvswitch-agent'
$ovs_cleanup_service = undef
$destroy_patch_ports_service = undef
$linuxbridge_agent_package = 'neutron-linuxbridge-agent'
$sriov_nic_agent_service = 'neutron-sriov-agent'
$sriov_nic_agent_package = 'neutron-sriov-agent'