openstack
/
puppet-neutron
Code Issues Proposed changes

Merge "Use relative name for class inclusion"

This commit is contained in:
Zuul 2020-07-13 05:43:28 +00:00 committed by Gerrit Code Review
parent 13b3d3d298 f065e99adf
commit 9ef93e5a36
19 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/ml2/ovs.pp
View File

@ -254,9 +254,9 @@ class neutron::agents::ml2::ovs (
if $manage_vswitch {
if $enable_dpdk {
require ::vswitch::dpdk
require vswitch::dpdk
} else {
require ::vswitch::ovs
require vswitch::ovs
}
}

2
manifests/agents/n1kv_vem.pp
View File

@ -123,7 +123,7 @@ class neutron::agents::n1kv_vem (
include neutron::deps
include neutron::params
require ::vswitch::ovs
require vswitch::ovs
Exec { path => [ '/bin/', '/sbin/' , '/usr/bin/', '/usr/sbin/' ] }

2
manifests/plugins/ml2/arista.pp
View File

@ -55,7 +55,7 @@ class neutron::plugins::ml2::arista(
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
warning('Support for Arista plugin is deprecated and will be removed \
in a future release')

2
manifests/plugins/ml2/arista/l3.pp
View File

@ -60,7 +60,7 @@ class neutron::plugins::ml2::arista::l3(
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
warning('Support for Arista plugin is deprecated and will be removed \
in a future release')

2
manifests/plugins/ml2/bagpipe.pp
View File

@ -41,7 +41,7 @@ class neutron::plugins::ml2::bagpipe (
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
require neutron::plugins::ml2
neutron_plugin_ml2 {
'bagpipe/bagpipe_bgp_port': value => $bagpipe_bgp_port;

2
manifests/plugins/ml2/bigswitch.pp
View File

@ -15,7 +15,7 @@ class neutron::plugins::ml2::bigswitch (
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if($::osfamily != 'Redhat') {
# Drivers are only packaged for RedHat at this time

2
manifests/plugins/ml2/bigswitch/restproxy.pp
View File

@ -101,7 +101,7 @@ class neutron::plugins::ml2::bigswitch::restproxy (
) {
include neutron::deps
require ::neutron::plugins::ml2::bigswitch
require neutron::plugins::ml2::bigswitch
neutron_plugin_ml2 {
'restproxy/servers' : value => $servers;

2
manifests/plugins/ml2/cisco.pp
View File

@ -17,7 +17,7 @@ class neutron::plugins::ml2::cisco (
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if($::osfamily != 'Redhat') {
# Drivers are only packaged for RedHat at this time

2
manifests/plugins/ml2/cisco/vts.pp
View File

@ -54,7 +54,7 @@ class neutron::plugins::ml2::cisco::vts (
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
ensure_resource('package', 'python-cisco-controller',
{

2
manifests/plugins/ml2/fujitsu/cfab.pp
View File

@ -47,7 +47,7 @@ class neutron::plugins::ml2::fujitsu::cfab (
$save_config = true,
)
{
require ::neutron::plugins::ml2
require neutron::plugins::ml2
warning('FUJITSU plugin support is deprecated and will be removed in a future release')

2
manifests/plugins/ml2/fujitsu/fossw.pp
View File

@ -58,7 +58,7 @@ class neutron::plugins::ml2::fujitsu::fossw (
$ovsdb_port = 6640,
)
{
require ::neutron::plugins::ml2
require neutron::plugins::ml2
warning('FUJITSU plugin support is deprecated and will be removed in a future release')

2
manifests/plugins/ml2/mellanox.pp
View File

@ -17,7 +17,7 @@ class neutron::plugins::ml2::mellanox (
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time

2
manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp
View File

@ -52,7 +52,7 @@ class neutron::plugins::ml2::mellanox::mlnx_sdn_assist (
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
neutron_plugin_ml2 {
'sdn/username': value => $sdn_username;

2
manifests/plugins/ml2/networking_ansible.pp
View File

@ -38,7 +38,7 @@ class neutron::plugins::ml2::networking_ansible(
) {
include neutron::deps
include neutron::params
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if($::osfamily != 'RedHat') {
# Drivers are only packaged for RedHat at this time

2
manifests/plugins/ml2/networking_ansible_host.pp
View File

@ -42,7 +42,7 @@ define neutron::plugins::ml2::networking_ansible_host(
$manage_vlans = undef,
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if (($ansible_ssh_pass == undef and $ansible_ssh_private_key_file == undef) or
($ansible_ssh_pass != undef and $ansible_ssh_private_key_file != undef)) {

2
manifests/plugins/ml2/opendaylight.pp
View File

@ -55,7 +55,7 @@ class neutron::plugins::ml2::opendaylight (
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
ensure_resource('package', 'python-networking-odl',
{

2
manifests/plugins/ml2/ovn.pp
View File

@ -124,7 +124,7 @@ class neutron::plugins::ml2::ovn(
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
if ! is_service_default($ovn_l3_mode) {
validate_legacy(Boolean, 'validate_bool', $ovn_l3_mode)

2
manifests/plugins/ml2/vpp.pp
View File

@ -27,7 +27,7 @@ class neutron::plugins::ml2::vpp (
$etcd_pass = $::os_service_default,
) {
include neutron::deps
require ::neutron::plugins::ml2
require neutron::plugins::ml2
neutron_plugin_ml2 {
'ml2_vpp/etcd_host': value => $etcd_host;

2
manifests/plugins/ovs/opendaylight.pp
View File

@ -266,7 +266,7 @@ class neutron::plugins::ovs::opendaylight (
}
|-END
} elsif $enable_hw_offload {
require ::vswitch::ovs
require vswitch::ovs
$host_config = @("END":json/L)
{\
"supported_vnic_types": [{\