* add a switch to prevent the yum repository provisioning of SCL

mkonietzny · mkonietzny · commit e9c133e99b03 · 2016-09-08T16:48:45.000+02:00
* the switch is useful if the repository is already configured independent of this module
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -82,6 +82,7 @@
   $python_pyvenvs            = { },
   $python_requirements       = { },
   $use_epel                  = $python::params::use_epel,
+  $rhscl_use_public_repository = $python::params::rhscl_use_public_repository,
 ) inherits python::params{
 
   if $provider != undef and $provider != '' {
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -133,15 +133,16 @@
     }
     rhscl: {
       # rhscl is RedHat SCLs from softwarecollections.org
-      $scl_package = "rhscl-${::python::version}-epel-${::operatingsystemmajrelease}-${::architecture}"
-      package { $scl_package:
-        source   => "https://www.softwarecollections.org/en/scls/rhscl/${::python::version}/epel-${::operatingsystemmajrelease}-${::architecture}/download/${scl_package}.noarch.rpm",
-        provider => 'rpm',
-        tag      => 'python-scl-repo',
-      }
-
-      Package <| title == 'python' |> {
-        tag => 'python-scl-package',
+      if $::python::rhscl_use_public_repository {
+        $scl_package = "rhscl-${::python::version}-epel-${::operatingsystemmajrelease}-${::architecture}"
+        package { $scl_package:
+          source   => "https://www.softwarecollections.org/en/scls/rhscl/${::python::version}/epel-${::operatingsystemmajrelease}-${::architecture}/download/${scl_package}.noarch.rpm",
+          provider => 'rpm',
+          tag      => 'python-scl-repo',
+        }
+        Package <| title == 'python' |> {
+          tag => 'python-scl-package',
+        }
       }
 
       package { "${python}-scldevel":
@@ -157,11 +158,14 @@
         }
       }
 
-      Package <| tag == 'python-scl-repo' |> ->
+      if $::python::rhscl_use_public_repository {
+        Package <| tag == 'python-scl-repo' |> ->
+        Package <| tag == 'python-scl-package' |>
+      }
+
       Package <| tag == 'python-scl-package' |> ->
       Exec['python-scl-pip-install']
     }
-
     default: {
 
       package { 'pip':
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,4 +23,6 @@
     default  => 'gunicorn',
   }
 
+  $rhscl_use_public_repository = true
+
 }

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,6 @@`
`23`	`23`	`default => 'gunicorn',`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ $rhscl_use_public_repository = true`
	`27`	`+`
`26`	`28`	`}`