Merge "Remove Neutron LBaaS"

2019-06-05 17:17:15 +00:00 · 2019-06-05 17:17:15 +00:00 · 24608f6513
commit 24608f6513
parent 25c25ccc51 14436f915b
21 changed files with 12 additions and 205 deletions
--- a/capabilities-map.yaml
+++ b/capabilities-map.yaml
@ -211,11 +211,6 @@ topics:
            description: Enables Neutron BGPVPN Service Plugin
            requires:
              - overcloud-resource-registry-puppet.yaml
-          - file: environments/services/neutron-lbaasv2.yaml
-            title: Neutron LBaaSv2 Service Plugin
-            description: Enables Neutron LBaaSv2 Service Plugin and Agent
-            requires:
-              - overcloud-resource-registry-puppet.yaml
          - file: environments/neutron-bgpvpn-bagpipe.yaml
            title: Neutron Bagpipe Driver for BGPVPN Service Plugin
            description: Enables Neutron Bagpipe Driver as BGPVPN backend
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@ -110,8 +110,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
--- a/deployment/horizon/horizon-container-puppet.yaml
+++ b/deployment/horizon/horizon-container-puppet.yaml
@ -290,7 +290,6 @@ outputs:
              # https://bugs.launchpad.net/tripleo/+bug/1752132
              - ENABLE_MURANO=no
              - ENABLE_MISTRAL=yes
-              - ENABLE_NEUTRON_LBAAS=yes
              - ENABLE_OCTAVIA=yes
              - ENABLE_SAHARA=yes
              - ENABLE_TROVE=no
--- a/deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml
+++ b/deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml
@ -1,70 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Neutron LBaaS agent configured with Puppet
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  NeutronLbaasInterfaceDriver:
-    default: 'neutron.agent.linux.interface.OVSInterfaceDriver'
-    type: string
-  NeutronLbaasDeviceDriver:
-    default: 'neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver'
-    type: string
-  NeutronLbaasOvsUseVeth:
-    default: false
-    type: boolean
-    description: Uses veth for an interface or not
-
-resources:
-
-  NeutronBase:
-    type: ./neutron-base.yaml
-    properties:
-      ServiceData: {get_param: ServiceData}
-      ServiceNetMap: {get_param: ServiceNetMap}
-      DefaultPasswords: {get_param: DefaultPasswords}
-      EndpointMap: {get_param: EndpointMap}
-      RoleName: {get_param: RoleName}
-      RoleParameters: {get_param: RoleParameters}
-
-outputs:
-  role_data:
-    description: Role data for the Neutron LBaaS role.
-    value:
-      service_name: neutron_lbaas_agent
-      config_settings:
-        map_merge:
-          - get_attr: [NeutronBase, role_data, config_settings]
-          - neutron::agents::lbaas::interface_driver: {get_param: NeutronLbaasInterfaceDriver}
-            neutron::agents::lbaas::device_driver: {get_param: NeutronLbaasDeviceDriver}
-            neutron::agents::lbaas::ovs_use_veth: {get_param: NeutronLbaasOvsUseVeth}
-      step_config: |
-        include ::tripleo::profile::base::neutron::agents::lbaas
-      metadata_settings:
-        get_attr: [NeutronBase, role_data, metadata_settings]
--- a/deployment/neutron/neutron-lbaas-api-container-puppet.yaml
+++ b/deployment/neutron/neutron-lbaas-api-container-puppet.yaml
@ -1,70 +0,0 @@
-heat_template_version: rocky
-
-description: >
-  Containerized LBaaS Service Plugin
-
-parameters:
-  ServiceData:
-    default: {}
-    description: Dictionary packing service data
-    type: json
-  ServiceNetMap:
-    default: {}
-    description: Mapping of service_name -> network name. Typically set
-                 via parameter_defaults in the resource registry.  This
-                 mapping overrides those in ServiceNetMapDefaults.
-    type: json
-  DefaultPasswords:
-    default: {}
-    type: json
-  RoleName:
-    default: ''
-    description: Role name on which the service is applied
-    type: string
-  RoleParameters:
-    default: {}
-    description: Parameters specific to the role
-    type: json
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-  DockerNeutronConfigImage:
-    description: The container image to use for the neutron config_volume
-    type: string
-  NeutronServiceProviders:
-    default: 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default'
-    description: Global list of service providers used by neutron. This
-                 list should be passed in to ensure all service
-                 providers desired by the user are included. The
-                 provided default value only set the provider for the LBaaSv2
-                 subsystem.This is currently incompatible with enabling
-                 octavia-api as one service or the other will break because the defaults are different.
-    type: comma_delimited_list
-
-resources:
-
-  ContainersCommon:
-    type: ../containers-common.yaml
-
-outputs:
-  role_data:
-    description: Role data for the LBaaS role.
-    value:
-      service_name: neutron_lbaas_api
-      config_settings: {}
-      service_config_settings:
-        neutron_api:
-          neutron::server::service_providers: {get_param: NeutronServiceProviders}
-        horizon:
-          horizon::neutron_options:
-            enable_lb: True
-      puppet_config:
-        config_volume: 'neutron'
-        puppet_tags: neutron_lbaas_service_config
-        step_config: |
-          include ::tripleo::profile::base::neutron::lbaas
-        config_image: {get_param: DockerNeutronConfigImage}
-      kolla_config: {}
-      docker_config: {}
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@ -54,13 +54,6 @@ parameters:
    description: Name of the octavia management network interface using
                 for communication between octavia worker/health-manager
                 with the amphora machine.
-  OctaviaEventStreamerDriver:
-    type: string
-    default: "noop_event_streamer"
-    description: Name of the event streamer driver to use for syncing Octavia
-                 and Neutron LBaaS databases. It is highly recommended to
-                 disable if one doesn't need to sync the database or is running
-                 Octavia in standalone mode by setting to noop_event_streamer.

 resources:

--- a/environments/neutron-nsx.yaml
+++ b/environments/neutron-nsx.yaml
@ -14,4 +14,4 @@ resource_registry:
 parameter_defaults:
  NeutronCorePlugin: vmware_nsx.plugin.NsxV3Plugin
  DhcpAgentNotification: false
-  NeutronServicePlugins: 'qos,neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2'
+  NeutronServicePlugins: 'qos'
--- a/environments/services-baremetal/neutron-lbaasv2.yaml
+++ b/environments/services-baremetal/neutron-lbaasv2.yaml
@ -1,19 +0,0 @@
-# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
-#
-# Currently there are only two interface drivers for Neutron LBaaSv2
-# The default option is the standard OVS driver the other option is to be used
-# when linux bridges are used instead of OVS
-# In order to enable other backend, replace the content of NeutronLbaasInterfaceDriver
-#
-# - OVS: neutron.agent.linux.interface.OVSInterfaceDriver
-# - LinuxBridges: neutron.agent.linux.interface.BridgeInterfaceDriver
-resource_registry:
-  OS::TripleO::Services::NeutronLbaasv2Agent: ../../deployment/neutron/neutron-lbaas-agent-baremetal-puppet.yaml
-  OS::TripleO::Services::NeutronLbaasv2Api: ../../deployment/neutron/neutron-lbaas-api-container-puppet.yaml
-
-parameter_defaults:
-  NeutronLbaasInterfaceDriver: "neutron.agent.linux.interface.OVSInterfaceDriver"
-  NeutronLbaasDeviceDriver: "neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver"
-  NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
-  NeutronServicePlugins: "qos,router,trunk,lbaasv2"
-  NeutronLbaasOvsUseVeth: false
--- a/environments/services/neutron-lbaasv2.yaml
+++ b/environments/services/neutron-lbaasv2.yaml
@ -1,7 +0,0 @@
-# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
-resource_registry:
-  OS::TripleO::Services::NeutronLbaasv2Api: ../../deployment/neutron/neutron-lbaas-api-container-puppet.yaml
-
-parameter_defaults:
-  NeutronServiceProviders: ['LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default']
-  NeutronServicePlugins: "qos,router,trunk,lbaasv2"
--- a/environments/services/neutron-nsx-lbaasv2.yaml
+++ b/environments/services/neutron-nsx-lbaasv2.yaml
@ -1,6 +0,0 @@
-# A Heat environment file that can be used to deploy Neutron LBaaSv2 service
-resource_registry:
-  OS::TripleO::Services::NeutronLbaasv2Api: ../../deployment/neutron/neutron-lbaas-api-container-puppet.yaml
-
-parameter_defaults:
-  NeutronServiceProviders: ['LOADBALANCERV2:VMWareEdge:neutron_lbaas.drivers.vmware.edge_driver_v2.EdgeLoadBalancerDriverV2:default']
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -143,8 +143,6 @@ resource_registry:
  OS::TripleO::Services::NeutronL2gwApi: OS::Heat::None
  OS::TripleO::Services::NeutronL3Agent: OS::Heat::None
  OS::TripleO::Services::NeutronL2gwAgent: OS::Heat::None
-  OS::TripleO::Services::NeutronLbaasv2Agent: OS::Heat::None
-  OS::TripleO::Services::NeutronLbaasv2Api: OS::Heat::None
  OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None
  OS::TripleO::Services::OVNMetadataAgent: deployment/ovn/ovn-metadata-container-puppet.yaml
  # FIXME(shardy) the duplicate NeutronServer line can be removed when we've updated
--- a/releasenotes/notes/remove-neutron-lbaas-e72025b67de3563b.yaml
+++ b/releasenotes/notes/remove-neutron-lbaas-e72025b67de3563b.yaml
@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    The Neutron LBaaS project was retired. Upgrading to deployment to Train
+    release will not upgrade Neutron LBaaS. Learn more about its retirement and
+    Octavia as its successor at
+    https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
+deprecations:
+  - |
+    The Neutron LBaaS project was retired and support for it in TripleO
+    removed.
--- a/roles/Controller.yaml
+++ b/roles/Controller.yaml
@ -131,8 +131,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
--- a/roles/ControllerAllNovaStandalone.yaml
+++ b/roles/ControllerAllNovaStandalone.yaml
@ -98,7 +98,6 @@
    - OS::TripleO::Services::NeutronSfcApi
    - OS::TripleO::Services::NeutronCorePlugin
    - OS::TripleO::Services::NeutronL2gwApi
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NovaIronic
    - OS::TripleO::Services::ContainersLogrotateCrond
    - OS::TripleO::Services::OctaviaApi
--- a/roles/ControllerNoCeph.yaml
+++ b/roles/ControllerNoCeph.yaml
@ -124,8 +124,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
--- a/roles/ControllerNovaStandalone.yaml
+++ b/roles/ControllerNovaStandalone.yaml
@ -107,8 +107,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -104,7 +104,6 @@
    - OS::TripleO::Services::NeutronSfcApi
    - OS::TripleO::Services::NeutronCorePlugin
    - OS::TripleO::Services::NeutronL2gwApi
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NovaApi
    - OS::TripleO::Services::NovaConductor
    - OS::TripleO::Services::NovaIronic
--- a/roles/ControllerStorageNfs.yaml
+++ b/roles/ControllerStorageNfs.yaml
@ -133,8 +133,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
--- a/roles/Networker.yaml
+++ b/roles/Networker.yaml
@ -29,7 +29,6 @@
    - OS::TripleO::Services::NeutronDhcpAgent
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
    - OS::TripleO::Services::NeutronML2FujitsuFossw
--- a/roles/Standalone.yaml
+++ b/roles/Standalone.yaml
@ -118,8 +118,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab
    - OS::TripleO::Services::NeutronML2FujitsuFossw
--- a/roles_data.yaml
+++ b/roles_data.yaml
@ -134,8 +134,6 @@
    - OS::TripleO::Services::NeutronL2gwAgent
    - OS::TripleO::Services::NeutronL2gwApi
    - OS::TripleO::Services::NeutronL3Agent
-    - OS::TripleO::Services::NeutronLbaasv2Agent
-    - OS::TripleO::Services::NeutronLbaasv2Api
    - OS::TripleO::Services::NeutronLinuxbridgeAgent
    - OS::TripleO::Services::NeutronMetadataAgent
    - OS::TripleO::Services::NeutronML2FujitsuCfab