Skip to content

Commit

Permalink
(MODULES-9193) Revert part of MODULES-9177
Browse files Browse the repository at this point in the history
The changes introduced in MODULES-9177 modified the behaviour of docker
installs using older versions. The first part of the modified regex ensured
that the correct repository was used. As such I have reverted it but
left the rest of the changes to ensure that non 17.y.z versions use the
correct repo.
  • Loading branch information
eimlav committed May 30, 2019
1 parent b7e0e24 commit 672b7a3
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -660,6 +660,7 @@
} else {
$root_dir_flag = '--data-root'
}


if $ensure != 'absent' {
contain 'docker::repos'
Expand Down

0 comments on commit 672b7a3

Please sign in to comment.