Split up neutron-lbaas service plugin and agent

Splitting up service plugin and agent allows operators to deploy
neutron-lbaas with greater granularity over what one wants to get
installed configured. For example, one may want to configure only one of
the two.

Change-Id: If3af333b34d2af764d111d49e981f9d3a170d803
This commit is contained in:
Carlos Goncalves 2018-04-05 20:00:29 +01:00
parent 5db20541e9
commit b93250af11
3 changed files with 52 additions and 11 deletions

View File

@ -0,0 +1,41 @@
# 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
}
}
}

View File

@ -14,31 +14,22 @@
#
# == Class: tripleo::profile::base::neutron::lbaas
#
# Neutron LBaaS Agent profile for tripleo
# Neutron LBaaS Service plugin 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::lbaas(
$manage_haproxy_package = hiera('manage_haproxy_package', false),
$step = Integer(hiera('step')),
) {
include ::tripleo::profile::base::neutron
#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 {
if $step >= 4 {
include ::neutron::services::lbaas
class {'::neutron::agents::lbaas':
manage_haproxy_package => $manage_haproxy_package
}
}
}

View File

@ -0,0 +1,9 @@
---
features:
- Split up neutron-lbaas service plugin and agent
upgrade:
- Class tripleo::profile::base::neutron::lbaas will only configure the
Neutron LBaaS service plugin from now on. Use class
tripleo::profile::base::neutron::agents::lbaas to configure the Neutron
LBaaS agent.