#3287: hardcode 'system::packages' dependency

jeff1evesque · Oct 3, 2018 · 6fd002b · 6fd002b
1 parent 7b19af2
commit 6fd002b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 21 deletions.
diff --git a/hiera/packages.yaml b/hiera/packages.yaml
@@ -27,3 +27,5 @@ system:
                 scrypt: '0.8.6'
                 pymongo: '3.7.1'
                 mlxtend: '0.13.0'
+                requests: '2.9.1'
+                flask: '10.0.2'
diff --git a/puppet/environment/docker/modules/mariadb/manifests/dependency.pp b/puppet/environment/docker/modules/mariadb/manifests/dependency.pp
@@ -2,8 +2,7 @@
 ### dependency.pp, ensure directories.
 ###
 class mariadb::dependency {
-    ## python dependencies
-    contain python
+    contain system::packages
 
     ## local variables
     $root_dir       = $::mariadb::root_dir
@@ -13,15 +12,15 @@
     if ($redis_version and $redis_version != '*') {
         package { 'pyyaml':
             ensure      => $pyyaml_version,
-            provider    => 'pip',
-            require     => Class['python'],
+            provider    => 'pip3',
+            require     => Class['system::packages'],
         }
     }
     else {
         package { 'pyyaml':
             ensure      => 'installed',
-            provider    => 'pip',
-            require     => Class['python'],
+            provider    => 'pip3',
+            require     => Class['system::packages'],
         }
     }
 

diff --git a/puppet/environment/docker/modules/sklearn/manifests/install.pp b/puppet/environment/docker/modules/sklearn/manifests/install.pp
@@ -2,7 +2,7 @@
 ### install.pp, install sklearn.
 ###
 class sklearn::install {
-    include python
+    include system::packages
 
     ## local variables
     $root_dir          = $::sklearn::root_dir
@@ -33,15 +33,15 @@
     if ($scikit_learn and $scikit_learn != '*') {
         package { "scikit_learn==${scikit_learn}":
             ensure   => 'installed',
-            provider => 'pip',
-            require  => Class['python'],
+            provider => 'pip3',
+            require  => Class['system::packages'],
         }
     }
     else {
         package { 'scikit_learn':
             ensure   => 'installed',
-            provider => 'pip',
-            require  => Class['python'],
+            provider => 'pip3',
+            require  => Class['system::packages'],
         }
     }
 }
diff --git a/puppet/environment/docker/modules/webserver/manifests/install.pp b/puppet/environment/docker/modules/webserver/manifests/install.pp
@@ -3,9 +3,7 @@
 ###
 class webserver::install {
     ## python dependencies
-    include python
-    include python::flask
-    include python::requests
+    include system::packages
 
     ## local variables
     $pyyaml_version     = $::webserver::pyyaml_version
@@ -19,23 +17,23 @@
     if ($platform == 'development') {
         package { 'pytest-cov':
             ensure      => $pytest_cov_version,
-            provider    => 'pip',
-            require     => Class['python'],
+            provider    => 'pip3',
+            require     => Class['system::packages'],
         }
     }
 
     ## pyyaml
     package { 'pyyaml':
         ensure          => $pyyaml_version,
-        provider        => 'pip',
-        require         => Class['python'],
+        provider        => 'pip3',
+        require         => Class['system::packages'],
     }
 
     ## redis client
     package { 'redis':
         ensure          => $redis_version,
-        provider        => 'pip',
-        require         => Class['python'],
+        provider        => 'pip3',
+        require         => Class['system::packages'],
     }
 
     ## mariadb client
@@ -51,6 +49,6 @@
     ## install gunicorn
     package { 'gunicorn':
         ensure      => $gunicorn_version,
-        provider    => 'pip',
+        provider    => 'pip3',
     }
 }