From f065e99adff565e5e3e5338cfc4e626ae03b35c7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 9 Jul 2020 15:57:16 +0900 Subject: [PATCH] Use relative name for class inclusion This patch replces the remaining usage of absolute name in 'require', and makes all class inclusion depend on relative name. Change-Id: Ic4698d309e899303c7e2566187fb21a442fb930d --- manifests/agents/ml2/ovs.pp | 4 ++-- manifests/agents/n1kv_vem.pp | 2 +- manifests/plugins/ml2/arista.pp | 2 +- manifests/plugins/ml2/arista/l3.pp | 2 +- manifests/plugins/ml2/bagpipe.pp | 2 +- manifests/plugins/ml2/bigswitch.pp | 2 +- manifests/plugins/ml2/bigswitch/restproxy.pp | 2 +- manifests/plugins/ml2/cisco.pp | 2 +- manifests/plugins/ml2/cisco/vts.pp | 2 +- manifests/plugins/ml2/fujitsu/cfab.pp | 2 +- manifests/plugins/ml2/fujitsu/fossw.pp | 2 +- manifests/plugins/ml2/mellanox.pp | 2 +- manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp | 2 +- manifests/plugins/ml2/networking_ansible.pp | 2 +- manifests/plugins/ml2/networking_ansible_host.pp | 2 +- manifests/plugins/ml2/opendaylight.pp | 2 +- manifests/plugins/ml2/ovn.pp | 2 +- manifests/plugins/ml2/vpp.pp | 2 +- manifests/plugins/ovs/opendaylight.pp | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/manifests/agents/ml2/ovs.pp b/manifests/agents/ml2/ovs.pp index 526abe146..a06205937 100644 --- a/manifests/agents/ml2/ovs.pp +++ b/manifests/agents/ml2/ovs.pp @@ -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 } } diff --git a/manifests/agents/n1kv_vem.pp b/manifests/agents/n1kv_vem.pp index 78009e8a1..9a0a8b25b 100644 --- a/manifests/agents/n1kv_vem.pp +++ b/manifests/agents/n1kv_vem.pp @@ -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/' ] } diff --git a/manifests/plugins/ml2/arista.pp b/manifests/plugins/ml2/arista.pp index f8a9a5a8f..15654b646 100644 --- a/manifests/plugins/ml2/arista.pp +++ b/manifests/plugins/ml2/arista.pp @@ -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') diff --git a/manifests/plugins/ml2/arista/l3.pp b/manifests/plugins/ml2/arista/l3.pp index 439c367cc..e8d45d8de 100644 --- a/manifests/plugins/ml2/arista/l3.pp +++ b/manifests/plugins/ml2/arista/l3.pp @@ -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') diff --git a/manifests/plugins/ml2/bagpipe.pp b/manifests/plugins/ml2/bagpipe.pp index ee4bcd133..c7881092c 100644 --- a/manifests/plugins/ml2/bagpipe.pp +++ b/manifests/plugins/ml2/bagpipe.pp @@ -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; diff --git a/manifests/plugins/ml2/bigswitch.pp b/manifests/plugins/ml2/bigswitch.pp index 9e4de15cb..1fdebcd5f 100644 --- a/manifests/plugins/ml2/bigswitch.pp +++ b/manifests/plugins/ml2/bigswitch.pp @@ -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 diff --git a/manifests/plugins/ml2/bigswitch/restproxy.pp b/manifests/plugins/ml2/bigswitch/restproxy.pp index eba5aa8cd..0b501fe42 100644 --- a/manifests/plugins/ml2/bigswitch/restproxy.pp +++ b/manifests/plugins/ml2/bigswitch/restproxy.pp @@ -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; diff --git a/manifests/plugins/ml2/cisco.pp b/manifests/plugins/ml2/cisco.pp index bf0ee5357..d8572d467 100644 --- a/manifests/plugins/ml2/cisco.pp +++ b/manifests/plugins/ml2/cisco.pp @@ -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 diff --git a/manifests/plugins/ml2/cisco/vts.pp b/manifests/plugins/ml2/cisco/vts.pp index 7e67f0e0f..be8d27f80 100644 --- a/manifests/plugins/ml2/cisco/vts.pp +++ b/manifests/plugins/ml2/cisco/vts.pp @@ -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', { diff --git a/manifests/plugins/ml2/fujitsu/cfab.pp b/manifests/plugins/ml2/fujitsu/cfab.pp index dab4ef17d..ed9c734e2 100644 --- a/manifests/plugins/ml2/fujitsu/cfab.pp +++ b/manifests/plugins/ml2/fujitsu/cfab.pp @@ -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') diff --git a/manifests/plugins/ml2/fujitsu/fossw.pp b/manifests/plugins/ml2/fujitsu/fossw.pp index 72401024d..690ca0f0f 100644 --- a/manifests/plugins/ml2/fujitsu/fossw.pp +++ b/manifests/plugins/ml2/fujitsu/fossw.pp @@ -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') diff --git a/manifests/plugins/ml2/mellanox.pp b/manifests/plugins/ml2/mellanox.pp index 7d1340819..9d55725b9 100644 --- a/manifests/plugins/ml2/mellanox.pp +++ b/manifests/plugins/ml2/mellanox.pp @@ -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 diff --git a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp index 52c3b3873..1d2a5ad8a 100644 --- a/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp +++ b/manifests/plugins/ml2/mellanox/mlnx_sdn_assist.pp @@ -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; diff --git a/manifests/plugins/ml2/networking_ansible.pp b/manifests/plugins/ml2/networking_ansible.pp index 9486ab506..94688751f 100644 --- a/manifests/plugins/ml2/networking_ansible.pp +++ b/manifests/plugins/ml2/networking_ansible.pp @@ -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 diff --git a/manifests/plugins/ml2/networking_ansible_host.pp b/manifests/plugins/ml2/networking_ansible_host.pp index d028f8648..dfd3b99ba 100644 --- a/manifests/plugins/ml2/networking_ansible_host.pp +++ b/manifests/plugins/ml2/networking_ansible_host.pp @@ -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)) { diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp index d6d0c6b41..a6da1f952 100644 --- a/manifests/plugins/ml2/opendaylight.pp +++ b/manifests/plugins/ml2/opendaylight.pp @@ -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', { diff --git a/manifests/plugins/ml2/ovn.pp b/manifests/plugins/ml2/ovn.pp index 23bd426a6..404dbf894 100644 --- a/manifests/plugins/ml2/ovn.pp +++ b/manifests/plugins/ml2/ovn.pp @@ -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) diff --git a/manifests/plugins/ml2/vpp.pp b/manifests/plugins/ml2/vpp.pp index 65d4a4efb..91d82a7c5 100644 --- a/manifests/plugins/ml2/vpp.pp +++ b/manifests/plugins/ml2/vpp.pp @@ -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; diff --git a/manifests/plugins/ovs/opendaylight.pp b/manifests/plugins/ovs/opendaylight.pp index 10e2d1faf..8f591e3cf 100644 --- a/manifests/plugins/ovs/opendaylight.pp +++ b/manifests/plugins/ovs/opendaylight.pp @@ -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": [{\