From 88353e82674a4acd78b252b74d97232053d09ffe Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Mon, 13 May 2019 15:01:51 +0200 Subject: [PATCH] Remove Neutron LBaaS It will be removed in the Train cycle and commits are up to remove it from puppet-neutron [1]. [1] https://review.opendev.org/#/c/658801/ Change-Id: I3ffd7de708b228e1a28ba7b08ad9138cc715c533 --- README.md | 1 - docs/packstack.rst | 3 -- packstack/plugins/dashboard_500.py | 2 - packstack/plugins/neutron_350.py | 38 +------------------ packstack/plugins/prescript_000.py | 1 - .../modules/packstack/manifests/horizon.pp | 4 -- .../packstack/manifests/neutron/api.pp | 5 --- .../packstack/manifests/neutron/lbaas.pp | 9 ----- packstack/puppet/templates/network.pp | 3 -- .../notes/remove-lbaas-0054d83972c5afcf.yaml | 4 ++ tests/scenario002.sh | 2 - 11 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp create mode 100644 releasenotes/notes/remove-lbaas-0054d83972c5afcf.yaml diff --git a/README.md b/README.md index e130c367a..73f33724c 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,6 @@ the current matrix of available tests: | nova | X | X | X | X | | neutron | X | X | X | X | | neutron plugin | ovn | ovn | ovs | ovn | -| lbaasv2 | | | X | | | vpnaas | | | | | | cinder | X | X | | | | ceilometer | X | | | X | diff --git a/docs/packstack.rst b/docs/packstack.rst index 39f59770d..383179c53 100755 --- a/docs/packstack.rst +++ b/docs/packstack.rst @@ -784,9 +784,6 @@ Neutron config **CONFIG_NEUTRON_METADATA_PW** Password for the OpenStack Networking metadata agent. -**CONFIG_LBAAS_INSTALL** - Specify 'y' to install OpenStack Networking's Load-Balancing-as-a-Service (LBaaS). ['y', 'n'] - **CONFIG_NEUTRON_METERING_AGENT_INSTALL** Specify 'y' to install OpenStack Networking's L3 Metering agent ['y', 'n'] diff --git a/packstack/plugins/dashboard_500.py b/packstack/plugins/dashboard_500.py index c85722ad4..b42c4844d 100644 --- a/packstack/plugins/dashboard_500.py +++ b/packstack/plugins/dashboard_500.py @@ -197,8 +197,6 @@ def create_manifest(config, messages): config["CONFIG_HORIZON_NEUTRON_VPN"] = False if config['CONFIG_NEUTRON_INSTALL'] == 'y': - if config["CONFIG_LBAAS_INSTALL"] == 'y': - config["CONFIG_HORIZON_NEUTRON_LB"] = True if config["CONFIG_NEUTRON_FWAAS"] == 'y': config["CONFIG_HORIZON_NEUTRON_FW"] = True if config["CONFIG_NEUTRON_VPNAAS"] == 'y': diff --git a/packstack/plugins/neutron_350.py b/packstack/plugins/neutron_350.py index 6a875f98a..805f3286f 100644 --- a/packstack/plugins/neutron_350.py +++ b/packstack/plugins/neutron_350.py @@ -90,18 +90,6 @@ def initConfig(controller): "NEED_CONFIRM": True, "CONDITION": False}, - {"CMD_OPTION": "os-neutron-lbaas-install", - "PROMPT": "Should Packstack install Neutron LBaaS", - "OPTION_LIST": ["y", "n"], - "VALIDATORS": [validators.validate_options], - "DEFAULT_VALUE": "n", - "MASK_INPUT": False, - "LOOSE_VALIDATION": False, - "CONF_NAME": "CONFIG_LBAAS_INSTALL", - "USE_DEFAULT": False, - "NEED_CONFIRM": False, - "CONDITION": False}, - {"CMD_OPTION": "os-neutron-metering-agent-install", "PROMPT": ("Should Packstack install Neutron L3 Metering agent"), "OPTION_LIST": ["y", "n"], @@ -457,7 +445,7 @@ def initConfig(controller): "USE_DEFAULT": False, "NEED_CONFIRM": False, "CONDITION": False, - "MESSAGE": ("You have choosen OVN neutron backend. Note that this backend does not support LBaaS, VPNaaS or FWaaS services. " + "MESSAGE": ("You have choosen OVN neutron backend. Note that this backend does not support the VPNaaS or FWaaS services. " "Geneve will be used as encapsulation method for tenant networks"), "MESSAGE_VALUES": ["ovn"]}, @@ -562,10 +550,9 @@ def initSequences(controller): if ('geneve' not in config['CONFIG_NEUTRON_ML2_TYPE_DRIVERS']): config['CONFIG_NEUTRON_ML2_TYPE_DRIVERS'] += ', geneve' config['CONFIG_NEUTRON_ML2_TENANT_NETWORK_TYPES'] = 'geneve' - # VPNaaS, LBaaS and FWaaS are not supported with OVN + # VPNaaS and FWaaS are not supported with OVN config['CONFIG_NEUTRON_FWAAS'] = 'n' config['CONFIG_NEUTRON_VPNAAS'] = 'n' - config['CONFIG_LBAAS_INSTALL'] = 'n' config['CONFIG_NEUTRON_METERING_AGENT_INSTALL'] = 'n' # When using OVN we need to create the same L2 infrastucture as # for OVS, so I'm copying value for required variables and use @@ -622,8 +609,6 @@ def initSequences(controller): q_hosts = api_hosts | network_hosts | compute_hosts neutron_steps = [ - {'title': 'Preparing Neutron LBaaS Agent entries', - 'functions': [create_lbaas_manifests]}, {'title': 'Preparing Neutron API entries', 'functions': [create_manifests]}, {'title': 'Preparing Neutron L3 entries', @@ -739,13 +724,6 @@ def create_manifests(config, messages): service_plugins = ['qos', 'trunk'] service_providers = [] - if config['CONFIG_LBAAS_INSTALL'] == 'y': - lbaas_plugin = ('neutron_lbaas.services.loadbalancer.plugin.' - 'LoadBalancerPluginv2') - service_plugins.append(lbaas_plugin) - lbaas_sp = ('LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.' - 'plugin_driver.HaproxyOnHostPluginDriver:default') - service_providers.append(lbaas_sp) if use_ml2_with_ovn(config): service_plugins.append('ovn-router') @@ -919,18 +897,6 @@ def create_dhcp_manifests(config, messages): config['FIREWALL_NEUTRON_DHCPOUT_RULES'] = fw_details -def create_lbaas_manifests(config, messages): - if use_ml2_with_ovn(config): - return - global network_hosts - - if not config['CONFIG_LBAAS_INSTALL'] == 'y': - return - - for host in network_hosts: - config['CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'] = get_if_driver(config) - - def create_metering_agent_manifests(config, messages): if use_ml2_with_ovn(config): return diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py index 620f99a99..ef28400b5 100755 --- a/packstack/plugins/prescript_000.py +++ b/packstack/plugins/prescript_000.py @@ -388,7 +388,6 @@ def initConfig(controller): 'CONFIG_KEYSTONE_HOST', 'CONFIG_NAGIOS_HOST', 'CONFIG_NEUTRON_SERVER_HOST', - 'CONFIG_NEUTRON_LBAAS_HOSTS', 'CONFIG_NOVA_API_HOST', 'CONFIG_NOVA_CERT_HOST', 'CONFIG_NOVA_VNCPROXY_HOST', diff --git a/packstack/puppet/modules/packstack/manifests/horizon.pp b/packstack/puppet/modules/packstack/manifests/horizon.pp index f5d00208e..afd766975 100644 --- a/packstack/puppet/modules/packstack/manifests/horizon.pp +++ b/packstack/puppet/modules/packstack/manifests/horizon.pp @@ -40,10 +40,6 @@ class packstack::horizon () }, } - if hiera('CONFIG_LBAAS_INSTALL') == 'y' { - ensure_packages(['openstack-neutron-lbaas-ui'], {'ensure' => 'present'}) - } - if hiera('CONFIG_MAGNUM_INSTALL') == 'y' { ensure_packages(['openstack-magnum-ui'], {'ensure' => 'present'}) } diff --git a/packstack/puppet/modules/packstack/manifests/neutron/api.pp b/packstack/puppet/modules/packstack/manifests/neutron/api.pp index 8b7b658e6..829dabbbe 100644 --- a/packstack/puppet/modules/packstack/manifests/neutron/api.pp +++ b/packstack/puppet/modules/packstack/manifests/neutron/api.pp @@ -10,7 +10,6 @@ class packstack::neutron::api () $neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW') $neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS')) $neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS')) - $neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL')) class { '::neutron::keystone::authtoken': username => 'neutron', @@ -36,10 +35,6 @@ class packstack::neutron::api () mode => '0640', } - if $neutron_lbaas_enabled { - class { '::neutron::services::lbaas': } - } - if $neutron_vpnaas_enabled { class { '::neutron::services::vpnaas': } } diff --git a/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp b/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp deleted file mode 100644 index 9dfc31eeb..000000000 --- a/packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp +++ /dev/null @@ -1,9 +0,0 @@ -class packstack::neutron::lbaas () -{ - class { '::neutron::agents::lbaas': - interface_driver => hiera('CONFIG_NEUTRON_LBAAS_INTERFACE_DRIVER'), - device_driver => 'neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver', - user_group => 'haproxy', - debug => hiera('CONFIG_DEBUG_MODE'), - } -} diff --git a/packstack/puppet/templates/network.pp b/packstack/puppet/templates/network.pp index 88440d6ce..c23c6f505 100644 --- a/packstack/puppet/templates/network.pp +++ b/packstack/puppet/templates/network.pp @@ -22,9 +22,6 @@ if hiera('CONFIG_NEUTRON_INSTALL') == 'y' { if hiera('CONFIG_NEUTRON_FWAAS') == 'y' { include '::packstack::neutron::fwaas' } - if hiera('CONFIG_LBAAS_INSTALL') == 'y' { - include '::packstack::neutron::lbaas' - } if hiera('CONFIG_NEUTRON_L2_AGENT') != 'ovn' { include '::packstack::neutron::l3' } diff --git a/releasenotes/notes/remove-lbaas-0054d83972c5afcf.yaml b/releasenotes/notes/remove-lbaas-0054d83972c5afcf.yaml new file mode 100644 index 000000000..525eddbef --- /dev/null +++ b/releasenotes/notes/remove-lbaas-0054d83972c5afcf.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Neutron LBaaS has been removed from upstream and is now removed from Packstack. diff --git a/tests/scenario002.sh b/tests/scenario002.sh index 1837c331b..946dfbfd7 100755 --- a/tests/scenario002.sh +++ b/tests/scenario002.sh @@ -11,7 +11,6 @@ echo -e "Generating packstack config for: - glance (swift backend) - nova - neutron (ovs+vxlan) -- lbaasv2 - swift - sahara - trove @@ -39,7 +38,6 @@ $SUDO packstack ${ADDITIONAL_ARGS} \ --os-neutron-l2-agent=openvswitch \ --os-neutron-ml2-type-drivers="vxlan,flat" \ --os-neutron-ml2-tenant-network-types="vxlan" \ - --os-neutron-lbaas-install=y \ --os-neutron-vpnaas-install=n \ --os-sahara-install=y \ --os-trove-install=y \