From d9e3a96fc3bd8995ba75bf5881801a821e23c7b9 Mon Sep 17 00:00:00 2001 From: Andre Fernando Zanella Kantek Date: Tue, 7 Jun 2022 09:56:40 -0300 Subject: [PATCH] Debian: process route metric parameter It was detected that the static route's metric parameter is not applied on the kernel if configured on sysinv database. The cause is located on the puppet-network module not adding the information to /var/run/network-scripts.puppet/routes. This change adds the necessary modification to process the options field on the hiera file. Test Plan: PASS set parameter with system host-route-add and lock/unlock and verify metric value on the kernel Closes-Bug: 1977983 Signed-off-by: Andre Fernando Zanella Kantek Change-Id: Iafeb2f1d8f6280c84d66398c1d21dbbfe1869a09 --- ...5-Add-options-content-to-routes-file.patch | 52 +++++++++++++++++++ .../debian/deb_folder/patches/series | 3 +- 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 config/puppet-modules/puppet-network/debian/deb_folder/patches/0005-Add-options-content-to-routes-file.patch diff --git a/config/puppet-modules/puppet-network/debian/deb_folder/patches/0005-Add-options-content-to-routes-file.patch b/config/puppet-modules/puppet-network/debian/deb_folder/patches/0005-Add-options-content-to-routes-file.patch new file mode 100644 index 000000000..0176d5368 --- /dev/null +++ b/config/puppet-modules/puppet-network/debian/deb_folder/patches/0005-Add-options-content-to-routes-file.patch @@ -0,0 +1,52 @@ +From bb0bbacc137b769b5cac246ad95cb73fda8e2cd4 Mon Sep 17 00:00:00 2001 +From: Andre Fernando Zanella Kantek + +Date: Tue, 7 Jun 2022 09:00:18 -0300 +Subject: [PATCH] Add options content to routes file + +For Debian the contents of options was not added to the routes file +in /var/run/network-scripts-puppet/. Also making clear that the +contents of the file are managed by puppet + +Signed-off-by: Andre Fernando Zanella Kantek +--- + lib/puppet/provider/network_route/routes.rb | 6 +++--- + lib/puppet/type/network_route.rb | 5 +++++ + 2 files changed, 8 insertions(+), 3 deletions(-) + +diff --git a/lib/puppet/provider/network_route/routes.rb b/lib/puppet/provider/network_route/routes.rb +index 0575a2a..0874b1d 100644 +--- a/lib/puppet/provider/network_route/routes.rb ++++ b/lib/puppet/provider/network_route/routes.rb +@@ -117,9 +117,9 @@ Puppet::Type.type(:network_route).provide(:routes) do + def self.header + str = <<-HEADER + # HEADER: This file is being managed by puppet. Changes to +-# HEADER: routes that are not being managed by puppet will persist; +-# HEADER: however changes to routes that are being managed by puppet will +-# HEADER: be overwritten. In addition, file order is NOT guaranteed. ++# HEADER: routes that are not being managed by puppet will not persist; ++# HEADER: however changes to routes that are being managed by puppet will. ++# HEADER: In addition, file order is NOT guaranteed. + # HEADER: Last generated at: #{Time.now} + HEADER + str +diff --git a/lib/puppet/type/network_route.rb b/lib/puppet/type/network_route.rb +index 0328926..dceb942 100644 +--- a/lib/puppet/type/network_route.rb ++++ b/lib/puppet/type/network_route.rb +@@ -6,6 +6,11 @@ Puppet::Type.newtype(:network_route) do + + include PuppetX::Voxpupuli::Utils + ++ feature :provider_options, <<-EOD ++ The provider can accept a hash of arbitrary options. The semantics of ++ these options will depend on the provider. ++ EOD ++ + ensurable + + newparam(:name) do +-- +2.17.1 + diff --git a/config/puppet-modules/puppet-network/debian/deb_folder/patches/series b/config/puppet-modules/puppet-network/debian/deb_folder/patches/series index 13f07067c..3883cb55a 100644 --- a/config/puppet-modules/puppet-network/debian/deb_folder/patches/series +++ b/config/puppet-modules/puppet-network/debian/deb_folder/patches/series @@ -1,4 +1,5 @@ 0001-save-result-file-to-var-run-network-to-allow-manipul.patch 0002-set-provider-mode-when-formatting-interfaces-file.patch 0003-set-routes-file-to-var-run-network-scripts.puppet.patch -0004-Save-dir-path-variable-with-distinct-names.patch \ No newline at end of file +0004-Save-dir-path-variable-with-distinct-names.patch +0005-Add-options-content-to-routes-file.patch \ No newline at end of file