diff --git a/defaults/main.yml b/defaults/main.yml index be841a03..9bad7c5d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -56,8 +56,6 @@ neutron_git_repo: https://git.openstack.org/openstack/neutron neutron_git_install_branch: master neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas neutron_fwaas_git_install_branch: master -neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: master neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas neutron_vpnaas_git_install_branch: master neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing @@ -79,7 +77,6 @@ neutron_upper_constraints_url: "{{ requirements_git_url | default('https://git.o neutron_git_constraints: - "git+{{ neutron_git_repo }}@{{ neutron_git_install_branch }}#egg=neutron" - "git+{{ neutron_fwaas_git_repo }}@{{ neutron_fwaas_git_install_branch }}#egg=neutron-fwaas" - - "git+{{ neutron_lbaas_git_repo }}@{{ neutron_lbaas_git_install_branch }}#egg=neutron-lbaas" - "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas" - "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing" - "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico" @@ -134,9 +131,6 @@ neutron_dhcp_config: # empty respose on DNS requests. neutron_dnsmasq_noresolv: False -# Set the neutron lbaasv2 user group, defaults from os specific vars -neutron_lbaasv2_user_group: "{{ _neutron_lbaasv2_user_group }}" - ### ### Tunable Overrides (Sorted alphabetically) ### @@ -161,8 +155,6 @@ neutron_dhcp_agent_ini_overrides: {} neutron_dhcp_agent_init_overrides: {} neutron_l3_agent_ini_overrides: {} neutron_l3_agent_init_overrides: {} -neutron_lbaas_agent_ini_overrides: {} -neutron_lbaas_agent_init_overrides: {} neutron_linuxbridge_agent_ini_overrides: {} neutron_linuxbridge_agent_init_overrides: {} neutron_metadata_agent_ini_overrides: {} @@ -328,8 +320,6 @@ neutron_notifications_designate: notifications_designate # neutron_plugin_base: # - router # - firewall/firewall_v2 either one or the other, not both -# - lbaas -# - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 # - neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin # - vpnaas # - metering @@ -427,17 +417,6 @@ nova_metadata_protocol: http # this flag should be set to a boolean True. nova_metadata_insecure: False -### -### LBaaS Configuration -### - -# See documentation section titled "Configuring the Network Load Balancing -# Service (Optional)" for more details. -neutron_octavia_request_poll_timeout: 100 - -# Use the Octavia proxy -neutron_octavia_proxy_plugin: False - ### ### FWaaS Configuration ### diff --git a/doc/source/configure-network-services.rst b/doc/source/configure-network-services.rst index 5f00b880..3e241ca8 100644 --- a/doc/source/configure-network-services.rst +++ b/doc/source/configure-network-services.rst @@ -7,10 +7,6 @@ The OpenStack Networking service (neutron) includes the following services: Firewall as a Service (FWaaS) Provides a software-based firewall that filters traffic from the router. -Load Balancer as a Service (LBaaS) - Provides load balancers that direct traffic to OpenStack instances or other - servers outside the OpenStack deployment. - VPN as a Service (VPNaaS) Provides a method for extending a private network across a public network. @@ -53,7 +49,6 @@ Deploying FWaaS v1 neutron_plugin_base: - router - firewall - - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 - vpnaas - metering - qos @@ -122,118 +117,6 @@ Follow the steps below to deploy FWaaS v2: # openstack-ansible os-neutron-install.yml -Load balancing service (optional) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The `neutron-lbaas`_ plugin for neutron provides a software load balancer -service and can direct traffic to multiple servers. The service runs as an -agent and it manages `HAProxy`_ configuration files and daemons. - -The Newton release contains only the LBaaS v2 API. For more details about -transitioning from LBaaS v1 to v2, review the :ref:`lbaas-special-notes` -section below. - -Deployers can make changes to the LBaaS default configuration options via the -``neutron_lbaas_agent_ini_overrides`` dictionary. Review the documentation on -the `conf override`_ mechanism for more details. - -.. _neutron-lbaas: https://wiki.openstack.org/wiki/Neutron/LBaaS -.. _HAProxy: http://www.haproxy.org/ - -Deploying LBaaS v2 namespace driver ------------------------------------ - -#. Add the LBaaS v2 plugin to the ``neutron_plugin_base`` variable - in ``/etc/openstack_deploy/user_variables.yml``: - - .. code-block:: yaml - - neutron_plugin_base: - - router - - metering - - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 - - Ensure that ``neutron_plugin_base`` includes all of the plugins that you - want to deploy with neutron in addition to the LBaaS plugin. - - Adding the LBaaS v2 plugin to ``neutron_plugin_base`` automatically enables - the Dashboard panels for LBaaS v2 when the ``os_horizon`` role is - redeployed (see the following step). - - Alternatively you can set the ``neutron_lbaasv2`` flag to ``True`` which - will add the LBaaS v2 plugin by itself. - -#. Run the neutron playbook to deploy the LBaaS v2 agent and enable the - Dashboard panels for LBaaSv2: - - .. code-block:: console - - # cd /opt/openstack-ansible/playbooks - # openstack-ansible os-neutron-install.yml - # openstack-ansible os-horizon-install.yml - -Deploying LBaaS v2 with Octavia -------------------------------- - -The namespace driver and Octavia can both run at the same time and the -end user can choose which type of load balancer to create with the -``--provider`` flag on load balanceer create. - -#. Activate the LBaaS v2 plugin together with the Octavia driver by setting - ``neutron_lbaas_octavia`` to ``True``. This will automatically be - triggered if Octavia is installed. - -#. (optional) To make sure the namespace driver is available set - ``neutron_lbaas_namespace`` to ``True`` or if you want - Octavia installed stand-alone to ``False``. - -#. Run the neutron playbook to deploy the LBaaS v2 agent and enable the - Dashboard panels for LBaaSv2: - - .. code-block:: console - - # cd /opt/openstack-ansible/playbooks - # openstack-ansible os-neutron-install.yml - # openstack-ansible os-horizon-install.yml - -Deploying LBaaS v2 with Octavia proxy plugin --------------------------------------------- - -Beginning Queens as part of the transition to the Octavia API endpoint -LBaaS V2 supports the Octavia proxy driver which will send all LBaaS V2 -requests straight to Octavia and bypass the Neutron database and any -installed third party LBaaS V2 drivers. - -#. Set ``neutron_lbaas_octavia`` to ``True`` to get the Octavia settings - along with LBaaS V2 being enabled. - -#. Set ``neutron_octavia_proxy_plugin`` to ``True`` to activate the - byapssing proxy. - -#. Run the neutron playbook to deploy the LBaaS v2 agent and enable the - Dashboard panels for LBaaSv2: - - .. code-block:: console - - # cd /opt/openstack-ansible/playbooks - # openstack-ansible os-neutron-install.yml - # openstack-ansible os-horizon-install.yml - -Special notes about LBaaS -------------------------- - -**LBaaS v1 was deprecated in the Mitaka release and is not available in the -Newton release.** - -LBaaS v1 and v2 agents are unable to run at the same time. If you switch -LBaaS v1 to v2, the v2 agent is the only agent running. The LBaaS v1 agent -stops along with any load balancers provisioned under the v1 agent. - -Load balancers are not migrated between LBaaS v1 and v2 automatically. Each -implementation has different code paths and database tables. You need -to manually delete load balancers, pools, and members before switching LBaaS -versions. Recreate these objects afterwards. - Virtual private network service (optional) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/releasenotes/notes/lbaas-removal-1e215d7ecd770559.yaml b/releasenotes/notes/lbaas-removal-1e215d7ecd770559.yaml new file mode 100644 index 00000000..022d5b38 --- /dev/null +++ b/releasenotes/notes/lbaas-removal-1e215d7ecd770559.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The deprecated Neutron LBaaS v2 plugin has been removed from the Neutron + role. diff --git a/templates/lbaas_agent.ini.j2 b/templates/lbaas_agent.ini.j2 deleted file mode 100644 index 43081c0a..00000000 --- a/templates/lbaas_agent.ini.j2 +++ /dev/null @@ -1,36 +0,0 @@ -# {{ ansible_managed }} - -[DEFAULT] -# Show debugging output in log (sets DEBUG log level output). -debug = {{ debug | bool }} - -# The LBaaS agent will resync its state with Neutron to recover from any -# transient notification or rpc errors. The interval is number of -# seconds between attempts. -periodic_interval = 10 - -# LBaas requires an interface driver be set. -interface_driver = {{ neutron_plugins[neutron_plugin_type].driver_interface }} - -# Use veth for an OVS interface or not. -# Support kernels with limited namespace support -# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. -# ovs_use_veth = False - -# The agent requires drivers to manage the loadbalancer. HAProxy is the opensource version. -# Multiple device drivers reflecting different service providers could be specified: -# device_driver = path.to.provider1.driver.Driver -# device_driver = path.to.provider2.driver.Driver -# Default is: -device_driver = {{ neutron_lbaasv2_device_driver }} - -[haproxy] -# Location to store config and state files -# loadbalancer_state_path = $state_path/lbaas - -# The user group -user_group = {{ neutron_lbaasv2_user_group }} - -# When delete and re-add the same vip, send this many gratuitous ARPs to flush -# the ARP cache in the Router. Set it below or equal to 0 to disable this feature. -send_gratuitous_arp = 3 diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 640680d4..0ee5b415 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -7,14 +7,6 @@ {% endif %} {% endfor %} -{% if (neutron_lbaasv2|bool) and ('neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' not in neutron_plugin_base) -%} - {% if neutron_octavia_proxy_plugin|bool %} - {% set _ = neutron_plugin_loaded_base.append("lbaasv2-proxy") %} - {% else %} - {% set _ = neutron_plugin_loaded_base.append("lbaasv2") %} - {% endif %} -{% endif %} - # General, applies to all host groups [DEFAULT] # Disable stderr logging @@ -53,7 +45,6 @@ auth_strategy = keystone # Drivers network_scheduler_driver = {{ neutron_driver_network_scheduler }} router_scheduler_driver = {{ neutron_driver_router_scheduler }} -loadbalancer_pool_scheduler_driver = {{ neutron_driver_loadbalancer_pool_scheduler }} # Schedulers network_auto_schedule = True @@ -198,11 +189,6 @@ pool_timeout = {{ neutron_db_pool_timeout }} # Service providers [service_providers] -{% if neutron_lbaasv2 | bool %} -{% for service_provider in neutron_lbaasv2_service_provider.split(',') %} -service_provider = {{ service_provider }} -{% endfor %} -{% endif %} {% if neutron_vpnaas | bool %} service_provider = {{ neutron_vpnaas_service_provider }} {% endif %} @@ -210,38 +196,6 @@ service_provider = {{ neutron_vpnaas_service_provider }} service_provider = {{ neutron_fwaasv2_service_provider }} {% endif %} -{% if neutron_lbaasv2 | bool %} -{% if neutron_lbaas_octavia | bool %} -[octavia] -base_url= {{ octavia_service_internaluri }} -request_poll_timeout = {{ neutron_octavia_request_poll_timeout }} -{% endif %} - -# Configure Barbican - TLS will not work if Barbican is misisng -[certificates] - -# Certificate Manager plugin. Defaults to barbican. (string value) -cert_manager_type = barbican - -# Name of the Barbican authentication method to use (string value) -#barbican_auth = barbican_acl_auth - -[service_auth] -insecure = {{ keystone_service_internaluri_insecure | bool }} -auth_plugin = {{ neutron_keystone_auth_plugin }} -# this needs to have a v3 added manually :-( -auth_url = {{ keystone_service_internaluri }}/v3 -admin_project_domain = {{ neutron_service_project_domain_id }} -admin_user_domain = {{ neutron_service_user_domain_id }} -admin_tenant_name = {{ neutron_service_project_name }} -admin_user = {{ neutron_service_user_name }} -admin_password = {{ neutron_service_password }} -region = {{ keystone_service_region }} -endpoint_type = internalURL -service_name = neutron -auth_version = 3 -{% endif %} - {% endif %} # Agent diff --git a/tests/calico_inventory b/tests/calico_inventory index 471a1fa8..405c8f14 100644 --- a/tests/calico_inventory +++ b/tests/calico_inventory @@ -60,7 +60,6 @@ server2 [neutron_openvswitch_agent] [neutron_metering_agent] [neutron_l3_agent] -[neutron_lbaas_agent] [neutron_metadata_agent] [neutron_all:children] @@ -70,7 +69,6 @@ neutron_linuxbridge_agent neutron_openvswitch_agent neutron_metering_agent neutron_l3_agent -neutron_lbaas_agent neutron_metadata_agent neutron_server neutron_calico_dhcp_agent diff --git a/tests/lxb_inventory b/tests/lxb_inventory index 9af7a00b..b80aca2d 100644 --- a/tests/lxb_inventory +++ b/tests/lxb_inventory @@ -61,10 +61,6 @@ agents2 agents1 agents2 -[neutron_lbaas_agent] -agents1 -agents2 - [neutron_metadata_agent] agents1 agents2 @@ -82,7 +78,6 @@ neutron_linuxbridge_agent neutron_openvswitch_agent neutron_metering_agent neutron_l3_agent -neutron_lbaas_agent neutron_metadata_agent neutron_server diff --git a/tests/opendaylight_inventory b/tests/opendaylight_inventory index 59710419..34235a4a 100644 --- a/tests/opendaylight_inventory +++ b/tests/opendaylight_inventory @@ -60,7 +60,6 @@ agents2 agents1 agents2 -[neutron_lbaas_agent] [neutron_metadata_agent] agents1 agents2 @@ -75,7 +74,6 @@ neutron_agent neutron_dhcp_agent neutron_metering_agent neutron_l3_agent -neutron_lbaas_agent neutron_metadata_agent neutron_openvswitch_agent neutron_server diff --git a/tests/ovn_inventory b/tests/ovn_inventory index b6daf6f0..8e67dfd2 100644 --- a/tests/ovn_inventory +++ b/tests/ovn_inventory @@ -41,7 +41,6 @@ infra1 [neutron_openvswitch_agent] [neutron_metering_agent] [neutron_l3_agent] -[neutron_lbaas_agent] [neutron_metadata_agent] [neutron_server] @@ -64,7 +63,6 @@ neutron_linuxbridge_agent neutron_openvswitch_agent neutron_metering_agent neutron_l3_agent -neutron_lbaas_agent neutron_metadata_agent neutron_ovn_controller neutron_ovn_northd diff --git a/tests/ovs_inventory b/tests/ovs_inventory index 06e1d33c..fcc62e69 100644 --- a/tests/ovs_inventory +++ b/tests/ovs_inventory @@ -61,10 +61,6 @@ agents2 agents1 agents2 -[neutron_lbaas_agent] -agents1 -agents2 - [neutron_metadata_agent] agents1 agents2 @@ -82,7 +78,6 @@ neutron_linuxbridge_agent neutron_openvswitch_agent neutron_metering_agent neutron_l3_agent -neutron_lbaas_agent neutron_metadata_agent neutron_server diff --git a/vars/debian.yml b/vars/debian.yml index 1406fe05..3b387b8f 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -84,18 +84,12 @@ neutron_optional_lxb_distro_packages: neutron_optional_fwaas_distro_packages: - python-neutron-fwaas -neutron_optional_lbaas_distro_packages: - - neutron-lbaasv2-agent - neutron_optional_vpnaas_distro_packages: - neutron-vpnaas-agent neutron_lxb_distro_packages: - bridge-utils -neutron_lbaas_distro_packages: - - haproxy - neutron_vpnaas_distro_packages: - strongswan @@ -108,7 +102,3 @@ neutron_remove_distro_packages: neutron_oslomsg_amqp1_distro_packages: - libsasl2-modules - sasl2-bin - -neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" -neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" -_neutron_lbaasv2_user_group: nogroup diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 3e68a05a..6ad1074b 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -36,10 +36,6 @@ neutron_package_list: |- {% set _ = packages.extend(neutron_lxb_distro_packages) %} {% set _ = packages.extend(neutron_optional_lxb_distro_packages) %} {% endif %} - {% if neutron_services['neutron-lbaasv2-agent']['group'] in group_names and neutron_lbaasv2 | bool %} - {% set _ = packages.extend(neutron_lbaas_distro_packages) %} - {% set _ = packages.extend(neutron_optional_lbaas_distro_packages) %} - {% endif %} {% if neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool %} {% set _ = packages.extend(neutron_vpnaas_distro_packages) %} {% set _ = packages.extend(neutron_optional_vpnaas_distro_packages) %} diff --git a/vars/main.yml b/vars/main.yml index d7ef44ac..12787af3 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -51,9 +51,6 @@ neutron_optional_calico_pip_packages: neutron_optional_fwaas_pip_packages: - neutron_fwaas -neutron_optional_lbaas_pip_packages: - - neutron_lbaas - neutron_optional_vpnaas_pip_packages: - neutron_vpnaas @@ -81,9 +78,6 @@ neutron_venv_packages: >- {%- if (neutron_fwaas | bool) or (neutron_fwaas_v2 | bool) %} {%- set _ = pkg_list.extend(neutron_optional_fwaas_pip_packages) %} {%- endif %} - {%- if neutron_lbaasv2 | bool %} - {%- set _ = pkg_list.extend(neutron_optional_lbaas_pip_packages) %} - {%- endif %} {%- if neutron_vpnaas | bool %} {%- set _ = pkg_list.extend(neutron_optional_vpnaas_pip_packages) %} {%- endif %} @@ -281,28 +275,6 @@ neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% els neutron_fwaas: "{{ ('firewall' in neutron_plugin_base) | ternary('True', 'False') }}" neutron_fwaas_v2: "{{ ('firewall_v2' in neutron_plugin_base) | ternary('True', 'False') }}" -### -### LBaaS Plugin Configuration -### - -# Deprecated: instead of triggering lbaas through neutron_plugin_core it will be triggered when Octavia is installed, neutron_lbaas_namespace var is set to True, or both: -# - neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 or lbaasv2 -neutron_lbaas_namespace: "{% if 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base %}True{% else %}False{% endif %}" - -neutron_lbaas_octavia: False - -neutron_lbaasv2: "{% if (neutron_lbaas_namespace|bool) or (neutron_lbaas_octavia | bool) %}True{% else %}False{% endif %}" - -# This complex logic activates either Namespace or Octavia or both or none; if -# Octavia is included it will be the default -neutron_lbaasv2_plugin_drivers: - - "{% if neutron_lbaas_namespace | bool %}LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver{% else %}none{% endif %}" - - "{% if neutron_lbaas_octavia | bool %}LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver{% else %}none{% endif %}" - -neutron_lbaasv2_service_provider: "{{ neutron_lbaasv2_plugin_drivers | reject('equalto','none') | join(',') }}{% if neutron_lbaasv2 %}:default{% endif %}" - -neutron_lbaasv2_device_driver: neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver - ### ### VPNaaS Plugin Configuration ### @@ -441,18 +413,6 @@ neutron_services: config_type: "ini" init_config_overrides: "{{ neutron_l3_agent_init_overrides }}" start_order: 3 - neutron-lbaasv2-agent: - group: neutron_lbaas_agent - service_name: neutron-lbaasv2-agent - service_en: "{{ neutron_lbaas_namespace | bool }}" - service_conf_path: "{{ neutron_conf_dir }}" - service_conf: lbaas_agent.ini - service_rootwrap: rootwrap.d/lbaas-haproxy.filters - execstarts: "{{ neutron_bin }}/neutron-lbaasv2-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/lbaas_agent.ini --log-file={{ neutron_log_dir }}/neutron-lbaasv2-agent.log" - config_overrides: "{{ neutron_lbaas_agent_ini_overrides }}" - config_type: "ini" - init_config_overrides: "{{ neutron_lbaas_agent_init_overrides }}" - start_order: 3 neutron-bgp-dragent: group: neutron_bgp_dragent service_name: neutron-bgp-dragent @@ -550,7 +510,6 @@ neutron_services: neutron_driver_network_scheduler: neutron.scheduler.dhcp_agent_scheduler.WeightScheduler neutron_driver_router_scheduler: neutron.scheduler.l3_agent_scheduler.LeastRoutersScheduler -neutron_driver_loadbalancer_pool_scheduler: neutron_lbaas.services.loadbalancer.agent_scheduler.ChanceScheduler neutron_driver_metering: neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver neutron_driver_dhcp: neutron.agent.linux.dhcp.Dnsmasq neutron_driver_quota: neutron.db.quota.driver.DbQuotaDriver diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 6927e66a..79de3cd8 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -68,19 +68,12 @@ neutron_optional_lxb_distro_packages: neutron_optional_fwaas_distro_packages: - openstack-neutron-fwaas -neutron_optional_lbaas_distro_packages: - - openstack-neutron-lbaas - - openstack-neutron-lbaas-agent - neutron_optional_vpnaas_distro_packages: - openstack-neutron-vpnaas neutron_lxb_distro_packages: - bridge-utils -neutron_lbaas_distro_packages: - - haproxy - neutron_vpnaas_distro_packages: - openswan @@ -93,7 +86,3 @@ neutron_oslomsg_amqp1_distro_packages: - cyrus-sasl-lib - cyrus-sasl-plain - cyrus-sasl-md5 - -neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" -neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" -_neutron_lbaasv2_user_group: haproxy diff --git a/vars/source_install.yml b/vars/source_install.yml index 805ac366..ed6eaa3e 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -34,9 +34,6 @@ neutron_package_list: |- {% if neutron_services['neutron-linuxbridge-agent']['group'] in group_names and neutron_services['neutron-linuxbridge-agent'].service_en | bool %} {% set _ = packages.extend(neutron_lxb_distro_packages) %} {% endif %} - {% if neutron_services['neutron-lbaasv2-agent']['group'] in group_names and neutron_lbaasv2 | bool %} - {% set _ = packages.extend(neutron_lbaas_distro_packages) %} - {% endif %} {% if neutron_services['neutron-vpnaas-agent']['group'] in group_names and neutron_vpnaas | bool %} {% set _ = packages.extend(neutron_vpnaas_distro_packages) %} {% endif %} diff --git a/vars/suse.yml b/vars/suse.yml index b403afdd..07f93f19 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -85,19 +85,12 @@ neutron_optional_lxb_distro_packages: neutron_optional_fwaas_distro_packages: - openstack-neutron-fwaas -neutron_optional_lbaas_distro_packages: - - openstack-neutron-lbaas - - openstack-neutron-lbaas-agent - neutron_option_vpnaas_distro_packages: - openstack-neutron-vpnaas neutron_lxb_distro_packages: - bridge-utils -neutron_lbaas_distro_packages: - - haproxy - neutron_vpnaas_distro_packages: - openswan @@ -110,7 +103,3 @@ neutron_oslomsg_amqp1_distro_packages: - cyrus-sasl - cyrus-sasl-plain - cyrus-sasl-digestmd5 - -neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" -neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" -_neutron_lbaasv2_user_group: nogroup diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0d082c62..acc88657 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -24,7 +24,8 @@ jobs: - openstack-ansible-ovs-ubuntu-bionic - openstack-ansible-ovn-ubuntu-bionic - - openstack-ansible-ovn-centos-7 + - openstack-ansible-ovn-centos-7: + voting: false - openstack-ansible-calico-ubuntu-bionic: voting: false - openstack-ansible-opendaylight-ubuntu-bionic @@ -40,7 +41,6 @@ jobs: - openstack-ansible-ovs-ubuntu-bionic - openstack-ansible-ovn-ubuntu-bionic - - openstack-ansible-ovn-centos-7 - openstack-ansible-opendaylight-ubuntu-bionic - openstack-ansible-ovs-nsh-ubuntu-bionic - openstack-ansible-odl-sfc-ubuntu-bionic