Skip to content

Commit

Permalink
Do not enforce the source value for yum provider
Browse files Browse the repository at this point in the history
W/o this issue, source for package is always being constructed
as an Internet link in case of RedHat/SUSE.

This is a problem as we may want to use no source in case of
yum provider.

The solution is to not construct the real_package_source for yum
provider and use it as is.

Closes-bug: #MODULES-1631

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
  • Loading branch information
Bogdan Dobrelya committed Jan 2, 2015
1 parent 1cc2e54 commit ced14e7
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@
# $package_source needs to override the constructed value in params.pp
if $package_source { # $package_source was specified by user so use that one
$real_package_source = $package_source
} else { # package_source was not specified, so construct it
# NOTE(bogdando) do not enforce the source value for yum provider #MODULES-1631
} elsif $package_provider != 'yum' {
# package_source was not specified, so construct it, unless the provider is 'yum'
case $::osfamily {
'RedHat', 'SUSE': {
$base_version = regsubst($version,'^(.*)-\d$','\1')
Expand All @@ -131,6 +133,8 @@
$real_package_source = ''
}
}
} else { # for yum provider, use the source as is
$real_package_source = $package_source
}

include '::rabbitmq::install'
Expand Down

0 comments on commit ced14e7

Please sign in to comment.