Merge pull request #2568 from puppetlabs/CAT-2032

Ramesh7 · web-flow · commit dd0b61c4c0d5 · 2024-09-23T14:25:09.000+05:30
Fix apache2-mod_php7 not found for SLES-15
diff --git a/manifests/mod/php.pp b/manifests/mod/php.pp
@@ -111,8 +111,8 @@
     if ($_package_name == 'apache2-mod_php7' and versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
+        command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
+        unless  => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
       }
     }
 
diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -10,8 +10,8 @@
     if (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {
       exec { 'enable legacy repos':
         path    => '/bin:/usr/bin/:/sbin:/usr/sbin',
-        command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',
-        unless  => 'SUSEConnect --status-text | grep sle-module-legacy/15.5/x86_64',
+        command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
+        unless  => "SUSEConnect --status-text | grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",
       }
     }
     # needed for netstat, for serverspec checks

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,8 @@`
`111`	`111`	`if ($_package_name == 'apache2-mod_php7' and versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {`
`112`	`112`	`exec { 'enable legacy repos':`
`113`	`113`	`path => '/bin:/usr/bin/:/sbin:/usr/sbin',`
`114`		`- command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',`
`115`		`- unless => 'SUSEConnect --status-text \| grep sle-module-legacy/15.5/x86_64',`
	`114`	`+ command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",`
	`115`	`+ unless => "SUSEConnect --status-text \| grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",`
`116`	`116`	`}`
`117`	`117`	`}`
`118`	`118`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`if (versioncmp($facts['os']['release']['major'], '15') >= 0 and versioncmp($facts['os']['release']['minor'], '3') == 1) {`
`11`	`11`	`exec { 'enable legacy repos':`
`12`	`12`	`path => '/bin:/usr/bin/:/sbin:/usr/sbin',`
`13`		`- command => 'SUSEConnect --product sle-module-legacy/15.5/x86_64',`
`14`		`- unless => 'SUSEConnect --status-text \| grep sle-module-legacy/15.5/x86_64',`
	`13`	`+ command => "SUSEConnect --product sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",`
	`14`	`+ unless => "SUSEConnect --status-text \| grep sle-module-legacy/${facts['os']['release']['major']}.${facts['os']['release']['minor']}/x86_64",`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`# needed for netstat, for serverspec checks`