From e838f28b7d36a8b04399fffff01a6fdfd3cc23af Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:22:12 -0500 Subject: [PATCH 01/11] Changing to support puppet-network module instead. --- manifests/interface.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index ec98867..bafc103 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -79,7 +79,7 @@ # Setup interfaces for the slaves $bonding_slaves.each |String $ifname| { - network::interface { $ifname: + network_config { $ifname: ensure => $ensure, enable => $enable, onboot => $onboot, @@ -93,7 +93,7 @@ } # Setup the bonding interface - network::interface { $name: + network_config { $name: ensure => $ensure, enable => $enable, onboot => $onboot, @@ -107,7 +107,7 @@ mtu => $mtu, } } else { - network::interface { $name: + network_config { $name: ensure => $ensure, enable => $enable, onboot => $onboot, From 4e02bf860e6ee4b00506198ae13a4d1bd0df1247 Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:30:45 -0500 Subject: [PATCH 02/11] No enable anymore. --- manifests/interface.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index bafc103..8272482 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -81,7 +81,6 @@ $bonding_slaves.each |String $ifname| { network_config { $ifname: ensure => $ensure, - enable => $enable, onboot => $onboot, type => 'InfiniBand', master => $name, @@ -95,7 +94,6 @@ # Setup the bonding interface network_config { $name: ensure => $ensure, - enable => $enable, onboot => $onboot, type => 'Bond', ipaddress => $ipaddr, @@ -109,7 +107,6 @@ } else { network_config { $name: ensure => $ensure, - enable => $enable, onboot => $onboot, type => 'InfiniBand', ipaddress => $ipaddr, From 602760e415c6c488c3e27e8b54e81f4108abd10e Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:38:01 -0500 Subject: [PATCH 03/11] Removing type. --- manifests/interface.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index 8272482..ff01d2f 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -82,7 +82,6 @@ network_config { $ifname: ensure => $ensure, onboot => $onboot, - type => 'InfiniBand', master => $name, slave => 'yes', nm_controlled => $_nm_controlled, @@ -95,7 +94,6 @@ network_config { $name: ensure => $ensure, onboot => $onboot, - type => 'Bond', ipaddress => $ipaddr, netmask => $netmask, gateway => $gateway, @@ -108,7 +106,6 @@ network_config { $name: ensure => $ensure, onboot => $onboot, - type => 'InfiniBand', ipaddress => $ipaddr, netmask => $netmask, gateway => $gateway, From 0225e3c8fca2deb4f86c68179d08a8acf9854a39 Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:48:32 -0500 Subject: [PATCH 04/11] Removing gateway. --- manifests/interface.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index ff01d2f..c85661d 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -96,7 +96,6 @@ onboot => $onboot, ipaddress => $ipaddr, netmask => $netmask, - gateway => $gateway, bonding_master => 'yes', bonding_opts => $bonding_opts, nm_controlled => $_nm_controlled, @@ -108,7 +107,6 @@ onboot => $onboot, ipaddress => $ipaddr, netmask => $netmask, - gateway => $gateway, nm_controlled => $_nm_controlled, mtu => $mtu, options_extra_redhat => $options_extra_redhat, From 51bc062c0d81673ba2288d87ab4a9967d10b3de1 Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:52:41 -0500 Subject: [PATCH 05/11] No more nm_controlled. --- manifests/interface.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index c85661d..67bddb9 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -84,7 +84,6 @@ onboot => $onboot, master => $name, slave => 'yes', - nm_controlled => $_nm_controlled, mtu => $mtu, options_extra_redhat => $options_extra_redhat, } @@ -98,7 +97,6 @@ netmask => $netmask, bonding_master => 'yes', bonding_opts => $bonding_opts, - nm_controlled => $_nm_controlled, mtu => $mtu, } } else { @@ -107,7 +105,6 @@ onboot => $onboot, ipaddress => $ipaddr, netmask => $netmask, - nm_controlled => $_nm_controlled, mtu => $mtu, options_extra_redhat => $options_extra_redhat, } From eaf429d9f22a9f30d3c1a587ad23867c38729d82 Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 13:56:58 -0500 Subject: [PATCH 06/11] Extra options also not available. --- manifests/interface.pp | 2 -- 1 file changed, 2 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index 67bddb9..056d041 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -85,7 +85,6 @@ master => $name, slave => 'yes', mtu => $mtu, - options_extra_redhat => $options_extra_redhat, } } @@ -106,7 +105,6 @@ ipaddress => $ipaddr, netmask => $netmask, mtu => $mtu, - options_extra_redhat => $options_extra_redhat, } } From 0987cc0554834b02ab4cde1a892c74cc14bdedff Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 14:05:33 -0500 Subject: [PATCH 07/11] Fixing various defaults. --- manifests/interface.pp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/manifests/interface.pp b/manifests/interface.pp index 056d041..e2acef5 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -85,6 +85,8 @@ master => $name, slave => 'yes', mtu => $mtu, + method => 'static', + hotplug => 'false', } } @@ -97,6 +99,8 @@ bonding_master => 'yes', bonding_opts => $bonding_opts, mtu => $mtu, + method => 'static', + hotplug => 'false', } } else { network_config { $name: @@ -105,6 +109,8 @@ ipaddress => $ipaddr, netmask => $netmask, mtu => $mtu, + method => 'static', + hotplug => 'false', } } From 9a50a25250118439c3b74b8e51527feb8208407e Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Tue, 12 Dec 2023 15:46:14 -0500 Subject: [PATCH 08/11] Adding back type. --- manifests/interface.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/interface.pp b/manifests/interface.pp index e2acef5..783941b 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -87,6 +87,7 @@ mtu => $mtu, method => 'static', hotplug => 'false', + type => 'Infiniband', } } @@ -101,6 +102,7 @@ mtu => $mtu, method => 'static', hotplug => 'false', + type => 'Infiniband', } } else { network_config { $name: @@ -111,6 +113,7 @@ mtu => $mtu, method => 'static', hotplug => 'false', + type => 'Infiniband', } } From 39d5259168f4d2605f19fcdffa77f273dc123391 Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Wed, 13 Dec 2023 10:09:14 -0500 Subject: [PATCH 09/11] This may be able to pass aribitrary variables. --- manifests/interface.pp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index 783941b..d654739 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -87,7 +87,9 @@ mtu => $mtu, method => 'static', hotplug => 'false', - type => 'Infiniband', + options => { + 'type' => 'Infiniband' + } } } @@ -102,7 +104,9 @@ mtu => $mtu, method => 'static', hotplug => 'false', - type => 'Infiniband', + options => { + 'type' => 'Infiniband' + } } } else { network_config { $name: @@ -113,7 +117,9 @@ mtu => $mtu, method => 'static', hotplug => 'false', - type => 'Infiniband', + options => { + 'type' => 'Infiniband' + } } } From 2bdd69a10e369ce814dda104e91b0139b2e1aa8d Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Wed, 13 Dec 2023 10:20:30 -0500 Subject: [PATCH 10/11] Readding options. --- manifests/interface.pp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/manifests/interface.pp b/manifests/interface.pp index d654739..39c33e1 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -88,7 +88,8 @@ method => 'static', hotplug => 'false', options => { - 'type' => 'Infiniband' + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, } } } @@ -105,7 +106,9 @@ method => 'static', hotplug => 'false', options => { - 'type' => 'Infiniband' + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, + 'GATEWAY' => $gateway, } } } else { @@ -118,7 +121,9 @@ method => 'static', hotplug => 'false', options => { - 'type' => 'Infiniband' + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, + 'GATEWAY' => $gateway, } } } From a3f2353a5b9a6cf43677ef8ab723f362b674426c Mon Sep 17 00:00:00 2001 From: Paul Edmon Date: Fri, 12 Jan 2024 11:07:49 -0500 Subject: [PATCH 11/11] Updating for pull request. --- .fixtures.yml | 4 ++-- manifests/interface.pp | 19 ++++++++++--------- metadata.json | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index e17604d..4114863 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -13,7 +13,7 @@ fixtures: rsyslog: repo: https://github.com/saz/puppet-rsyslog.git network: - repo: https://github.com/example42/puppet-network.git - ref: v3.6.1 + repo: https://github.com/voxpupuli/puppet-network.git + ref: v2.1.0 symlinks: mofed: "#{source_dir}" diff --git a/manifests/interface.pp b/manifests/interface.pp index 39c33e1..c7c1f9c 100644 --- a/manifests/interface.pp +++ b/manifests/interface.pp @@ -88,8 +88,9 @@ method => 'static', hotplug => 'false', options => { - 'TYPE' => 'Infiniband', - 'NM_CONTROLLED' => $_nm_controlled, + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, + 'CONNECTED_MODE' => $connected_mode, } } } @@ -106,9 +107,10 @@ method => 'static', hotplug => 'false', options => { - 'TYPE' => 'Infiniband', - 'NM_CONTROLLED' => $_nm_controlled, - 'GATEWAY' => $gateway, + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, + 'GATEWAY' => $gateway, + 'CONNECTED_MODE' => $connected_mode, } } } else { @@ -121,11 +123,10 @@ method => 'static', hotplug => 'false', options => { - 'TYPE' => 'Infiniband', - 'NM_CONTROLLED' => $_nm_controlled, - 'GATEWAY' => $gateway, + 'TYPE' => 'Infiniband', + 'NM_CONTROLLED' => $_nm_controlled, + 'CONNECTED_MODE' => $connected_mode, } } } - } diff --git a/metadata.json b/metadata.json index 23d59db..3d8f2aa 100644 --- a/metadata.json +++ b/metadata.json @@ -25,8 +25,8 @@ "version_requirement": ">= 3.5.0 <6.0.0" }, { - "name": "example42/network", - "version_requirement": ">= 3.0.0 <4.0.0" + "name": "puppet/network", + "version_requirement": ">= 2.1.0 <4.0.0" } ], "operatingsystem_support": [