diff --git a/manifests/profile/base/neutron/agents/lbaas.pp b/manifests/profile/base/neutron/agents/lbaas.pp deleted file mode 100644 index eb6f1a647..000000000 --- a/manifests/profile/base/neutron/agents/lbaas.pp +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2018 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::neutron::lbaas -# -# Neutron LBaaS Agent profile for TripleO -# -# === Parameters -# -# [*manage_haproxy_package*] -# (Optional) Whether to manage the haproxy package. -# Defaults to hiera('manage_haproxy_package', false) -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::neutron::agents::lbaas( - $manage_haproxy_package = hiera('manage_haproxy_package', false), - $step = Integer(hiera('step')), -) { - - #LBaaS Driver needs to be run @ $step>=5 as the neutron service needs to already be active which is run @ $step==4 - if $step >= 5 { - class {'::neutron::agents::lbaas': - manage_haproxy_package => $manage_haproxy_package - } - } -} diff --git a/manifests/profile/base/neutron/lbaas.pp b/manifests/profile/base/neutron/lbaas.pp deleted file mode 100644 index c716e9e8f..000000000 --- a/manifests/profile/base/neutron/lbaas.pp +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::base::neutron::lbaas -# -# Neutron LBaaS Service plugin profile for TripleO -# -# === Parameters -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -class tripleo::profile::base::neutron::lbaas( - $step = Integer(hiera('step')), -) { - - include ::tripleo::profile::base::neutron - - if $step >= 4 { - include ::neutron::services::lbaas - } -} diff --git a/manifests/profile/pacemaker/neutron/lbaas.pp b/manifests/profile/pacemaker/neutron/lbaas.pp deleted file mode 100644 index 1b7ac851e..000000000 --- a/manifests/profile/pacemaker/neutron/lbaas.pp +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2016 Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# -# == Class: tripleo::profile::pacemaker::neutron::lbaas -# -# Neutron LBaaS Agent Pacemaker HA profile for tripleo -# -# === Parameters -# -# [*step*] -# (Optional) The current step in deployment. See tripleo-heat-templates -# for more details. -# Defaults to hiera('step') -# -# [*pacemaker_master*] -# (Optional) The hostname of the pacemaker master -# Defaults to hiera('neutron_lbaas_api_short_bootstrap_node_name') -# -class tripleo::profile::pacemaker::neutron::lbaas ( - $step = Integer(hiera('step')), - $pacemaker_master = hiera('neutron_lbaas_api_short_bootstrap_node_name'), -) { - - include ::neutron::params - include ::tripleo::profile::pacemaker::neutron - include ::tripleo::profile::base::neutron::lbaas - - if $step >= 5 and downcase($::hostname) == $pacemaker_master { - pacemaker::resource::service { $::neutron::params::lbaasv2_agent_service: - clone_params => 'interleave=true', - } - } -} diff --git a/releasenotes/notes/remove-neutron-lbaas-f6337e030a200b64.yaml b/releasenotes/notes/remove-neutron-lbaas-f6337e030a200b64.yaml new file mode 100644 index 000000000..886eebe7e --- /dev/null +++ b/releasenotes/notes/remove-neutron-lbaas-f6337e030a200b64.yaml @@ -0,0 +1,12 @@ +--- +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. +