Merge pull request #490 from eimlav/modules-9193

sheenaajay · web-flow · commit 6fee44d690d6 · 2019-05-30T23:00:32.000+01:00
(MODULES-9193) Revert part of MODULES-9177
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -594,7 +594,7 @@
     }
   }
 
-  if ( $version == undef ) or ( $version !~ /^(1[7-8][.][0-1][0-9][.][0-1](~|-|\.)ce|1.\d+)/ ) {
+  if ( $version == undef ) or ( $version !~ /^(17[.][0-1][0-9][.][0-1](~|-|\.)ce|1.\d+)/ ) {
     if ( $docker_ee) {
       $package_location = $docker::docker_ee_source_location
       $package_key_source = $docker::docker_ee_key_source
@@ -661,6 +661,7 @@
     $root_dir_flag = '--data-root'
   }
 
+
   if $ensure != 'absent' {
     contain 'docker::repos'
     contain 'docker::install'

Original file line number	Diff line number	Diff line change
`@@ -594,7 +594,7 @@`
`594`	`594`	`}`
`595`	`595`	`}`
`596`	`596`
`597`		`- if ( $version == undef ) or ( $version !~ /^(1[7-8][.][0-1][0-9][.][0-1](~\|-\|\.)ce\|1.\d+)/ ) {`
	`597`	`+ if ( $version == undef ) or ( $version !~ /^(17[.][0-1][0-9][.][0-1](~\|-\|\.)ce\|1.\d+)/ ) {`
`598`	`598`	`if ( $docker_ee) {`
`599`	`599`	`$package_location = $docker::docker_ee_source_location`
`600`	`600`	`$package_key_source = $docker::docker_ee_key_source`
`@@ -661,6 +661,7 @@`
`661`	`661`	`$root_dir_flag = '--data-root'`
`662`	`662`	`}`
`663`	`663`
	`664`	`+`
`664`	`665`	`if $ensure != 'absent' {`
`665`	`666`	`contain 'docker::repos'`
`666`	`667`	`contain 'docker::install'`