Merge pull request #55 from puppetlabs/scotty-c-cni-fix

davejrt · web-flow · commit 96c18a20d7f8 · 2018-01-31T08:06:12.000+11:00
Fix to stop RHEL family downgrading cni
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -5,11 +5,11 @@
 case $::osfamily {
   'Debian' : {
     $kubernetes_package_version = '1.7.3-01'
-    $cni_version = '0.6.0-00'
+    $cni_version = '0.5.1-01'
   }
   'RedHat' : {
     $kubernetes_package_version = '1.7.3'
-    $cni_version = '0.6.0'
+    $cni_version = '0.5.1'
   }
   default: { notify {"The OS family ${::os_family} is not supported by this module":} }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`case $::osfamily {`
`6`	`6`	`'Debian' : {`
`7`	`7`	`$kubernetes_package_version = '1.7.3-01'`
`8`		`- $cni_version = '0.6.0-00'`
	`8`	`+ $cni_version = '0.5.1-01'`
`9`	`9`	`}`
`10`	`10`	`'RedHat' : {`
`11`	`11`	`$kubernetes_package_version = '1.7.3'`
`12`		`- $cni_version = '0.6.0'`
	`12`	`+ $cni_version = '0.5.1'`
`13`	`13`	`}`
`14`	`14`	`default: { notify {"The OS family ${::os_family} is not supported by this module":} }`
`15`	`15`	`}`