Merge pull request #289 from bogdando/fix-MODULES-1631

cmurphy · cmurphy · commit cf301012f941 · 2015-01-12T15:29:26.000-08:00
Do not enforce the source value for yum provider
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -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')
@@ -131,6 +133,8 @@
         $real_package_source = ''
       }
     }
+  } else { # for yum provider, use the source as is
+    $real_package_source = $package_source
   }
 
   include '::rabbitmq::install'

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,9 @@`
`121`	`121`	`# $package_source needs to override the constructed value in params.pp`
`122`	`122`	`if $package_source { # $package_source was specified by user so use that one`
`123`	`123`	`$real_package_source = $package_source`
`124`		`- } else { # package_source was not specified, so construct it`
	`124`	`+ # NOTE(bogdando) do not enforce the source value for yum provider #MODULES-1631`
	`125`	`+ } elsif $package_provider != 'yum' {`
	`126`	`+ # package_source was not specified, so construct it, unless the provider is 'yum'`
`125`	`127`	`case $::osfamily {`
`126`	`128`	`'RedHat', 'SUSE': {`
`127`	`129`	`$base_version = regsubst($version,'^(.*)-\d$','\1')`
`@@ -131,6 +133,8 @@`
`131`	`133`	`$real_package_source = ''`
`132`	`134`	`}`
`133`	`135`	`}`
	`136`	`+ } else { # for yum provider, use the source as is`
	`137`	`+ $real_package_source = $package_source`
`134`	`138`	`}`
`135`	`139`
`136`	`140`	`include '::rabbitmq::install'`