openstack
/
puppet-tripleo
Code Issues Proposed changes

Remove manifests for VPP and Neutron ML2/VPP plugin 

... because these services are no longer supported by t-h-t. This
allows us to remove puppet-fdio, which looks unmaintained, from
the dependencies.

Depends-on: https://review.opendev.org/864605
Change-Id: Ibe0a59ad3dd9069e9650036cb2af31a3b9ddfb69
This commit is contained in:
Takashi Kajinami 2022-11-16 10:23:51 +09:00
parent d649079ee7
commit cd794e51ea
5 changed files with 0 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile_extras
View File

@ -9,10 +9,6 @@ mod 'etcd',
:git => 'https://github.com/puppet-etcd/puppet-etcd',
:ref => 'master'
mod 'fdio',
:git => 'https://git.fd.io/puppet-fdio',
:ref => 'master'
mod 'systemd',
:git => 'https://github.com/camptocamp/puppet-systemd',
:ref => 'master'

49
manifests/profile/base/neutron/agents/vpp.pp
View File

@ -1,49 +0,0 @@
# Copyright 2017 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::agents::vpp
#
# Neutron VPP Agent profile for tripleo
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to Integer(lookup('step'))
#
# [*etcd_host*]
# (Optional) etcd server VIP.
# Defaults to lookup('etcd_vip')
#
# [*etcd_port*]
# (Optional) etcd server listening port.
# Defaults to 2379
#
class tripleo::profile::base::neutron::agents::vpp(
$step = Integer(lookup('step')),
$etcd_host = lookup('etcd_vip'),
$etcd_port = 2379,
) {
if empty($etcd_host) {
fail('etcd_vip not set in hieradata')
}
if $step >= 4 {
class { 'neutron::agents::ml2::vpp':
etcd_host => $etcd_host,
etcd_port => $etcd_port,
}
}
}

4
manifests/profile/base/neutron/plugins/ml2.pp
View File

@ -67,10 +67,6 @@ class tripleo::profile::base::neutron::plugins::ml2 (
include tripleo::profile::base::neutron::plugins::ml2::ovn
}
if 'vpp' in $mechanism_drivers {
include tripleo::profile::base::neutron::plugins::ml2::vpp
}
if 'nuage' in $mechanism_drivers {
include tripleo::profile::base::neutron::plugins::ml2::nuage
}

49
manifests/profile/base/neutron/plugins/ml2/vpp.pp
View File

@ -1,49 +0,0 @@
# Copyright 2017 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::plugins::ml2::vpp
#
# VPP Neutron ML2 profile for tripleo
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to Integer(lookup('step'))
#
# [*etcd_host*]
# (Optional) etcd server VIP.
# Defaults to lookup('etcd_vip')
#
# [*etcd_port*]
# (Optional) etcd server listening port.
# Defaults to 2379
#
class tripleo::profile::base::neutron::plugins::ml2::vpp (
$step = Integer(lookup('step')),
$etcd_host = lookup('etcd_vip'),
$etcd_port = 2379,
) {
if empty($etcd_host) {
fail('etcd_vip not set in hieradata')
}
if $step >= 4 {
class { 'neutron::plugins::ml2::vpp':
etcd_host => $etcd_host,
etcd_port => $etcd_port,
}
}
}

32
manifests/profile/base/vpp.pp
View File

@ -1,32 +0,0 @@
# Copyright 2017 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::vpp
#
# vpp profile for tripleo
#
# === Parameters
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to lookup('step')
#
class tripleo::profile::base::vpp (
$step = Integer(lookup('step')),
) {
if $step >= 1 {
include fdio
}
}