Merge "Deprecate support for networking-ansible"

This commit is contained in:
Zuul 2022-05-31 16:59:33 +00:00 committed by Gerrit Code Review
commit 46cfe2b08b
3 changed files with 16 additions and 3 deletions

View File

@ -1,5 +1,6 @@
# == Class: neutron::plugins::ml2::networking_ansible
#
# DEPRECATED !!
# Configures the networking-ansible ML2 Mechanism Driver
#
# === Parameters
@ -35,11 +36,14 @@ class neutron::plugins::ml2::networking_ansible(
$host_configs,
$coordination_uri = $::os_service_default,
$package_ensure = 'present'
) {
) {
include neutron::deps
include neutron::params
require neutron::plugins::ml2
warning('Support for networking-ansible has been deprecated and \
will be removed in a future release.')
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time
fail("Unsupported osfamily ${::osfamily}")

View File

@ -1,6 +1,7 @@
# Defined type for networking-ansible configuration for a host/switch
# == Define: neutron::plugins::ml2::networking_ansible_host
#
# == Class: neutron::plugins::ml2::networking_ansible_host
# DEPRECATED !!
# Defined type for networking-ansible configuration for a host/switch
#
# === Parameters
#
@ -50,6 +51,9 @@ define neutron::plugins::ml2::networking_ansible_host(
include neutron::deps
require neutron::plugins::ml2
warning('Support for networking-ansible has been deprecated and \
will be removed in a future release.')
if ((is_service_default($ansible_ssh_pass) and is_service_default($ansible_ssh_private_key_file)) or
(!is_service_default($ansible_ssh_pass) and !is_service_default($ansible_ssh_private_key_file))) {
fail('One of ansible_ssh_pass OR ansible_ssh_private_key_file should be set')

View File

@ -0,0 +1,5 @@
---
deprecations:
- |
Support for the ``networking-ansible`` plugin has been deprecated, and will
be removed in a future release.