Feature clean up manifests (#19)

* clean up install.pp and also change pip and wheel to be ensure present * clean up firewalld.pp * clean up packages.pp * clean up postgresql.pp * clean up service.pp
jortencio · Jul 26, 2023 · a4ca78f · a4ca78f
1 parent 1eee80b
commit a4ca78f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 31 deletions.
diff --git a/manifests/firewalld.pp b/manifests/firewalld.pp
@@ -14,6 +14,5 @@
     zone     => 'public',
     port     => $superset::port,
     protocol => 'tcp',
-    }
-
+  }
 }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -5,9 +5,8 @@
 # @api private
 # 
 class superset::install {
-
   group { $superset::user :
-    ensure => present
+    ensure => present,
   }
 
   user { $superset::user:
@@ -24,7 +23,7 @@
     owner   => $superset::user,
     group   => $superset::user,
     mode    => '0755',
-    content => epp('superset/superset.sh.epp',{ superset_dir => $superset_venv_dir}),
+    content => epp('superset/superset.sh.epp', { superset_dir => $superset_venv_dir }),
   }
 
   # Create external fact for the install directory
@@ -53,25 +52,25 @@
     venv_dir   => $superset_venv_dir,
     systempkgs => false,
   }
-  
+
   # Update pip before install
   python::pip { 'pip':
-      ensure     => 'latest',
-      pkgname    => 'pip',
-      virtualenv => $superset_venv_dir,
-      owner      => $superset::user,
-      group      => $superset::user,
+    ensure     => 'present',
+    pkgname    => 'pip',
+    virtualenv => $superset_venv_dir,
+    owner      => $superset::user,
+    group      => $superset::user,
   }
 
   # Update wheel before install
   python::pip { 'wheel':
-      ensure     => 'latest',
-      pkgname    => 'wheel',
-      virtualenv => $superset_venv_dir,
-      owner      => $superset::user,
-      group      => $superset::user,
+    ensure     => 'present',
+    pkgname    => 'wheel',
+    virtualenv => $superset_venv_dir,
+    owner      => $superset::user,
+    group      => $superset::user,
   }
-  
+
   # Install apache superset
   python::pip { 'apache-superset':
     ensure     => $superset::version,
@@ -81,14 +80,6 @@
     group      => $superset::user,
   }
 
-  # Lock version of MarkupSafe due later versions breaking Superset https://github.com/apache/superset/issues/19150
-  # python::pip { 'MarkupSafe':
-  #     ensure     => '2.0.1',
-  #     pkgname    => 'MarkupSafe',
-  #     virtualenv => $superset_venv_dir,
-  #     owner      => $superset::user,
-  #     group      => $superset::user,
-  # }
   $superset::additional_python_lib.each | String $pkgname | {
     python::pip { $pkgname:
       ensure     => 'present',

diff --git a/manifests/packages.pp b/manifests/packages.pp
@@ -7,7 +7,6 @@
 class superset::packages {
   assert_private()
 
-
   $package_dependencies = lookup('superset::package_dependencies', Array)
 
   package { $package_dependencies:

diff --git a/manifests/postgresql.pp b/manifests/postgresql.pp
@@ -5,7 +5,6 @@
 # @api private
 #
 class superset::postgresql {
-
   if $superset::manage_db {
     class { 'postgresql::server':
     }

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -8,7 +8,6 @@
   assert_private()
 
   if $superset::manage_webserver {
-
     file { '/bin/superset.gunicorn':
       ensure  => file,
       owner   => $superset::user,
@@ -25,10 +24,12 @@
       content => epp('superset/superset.service.epp', { user => $superset::user }),
     }
 
-    service {'superset':
+    service { 'superset':
       ensure    => 'running',
-      subscribe => [File['/bin/superset.gunicorn'],
-                    File['/usr/lib/systemd/system/superset.service']]
+      subscribe => [
+        File['/bin/superset.gunicorn'],
+        File['/usr/lib/systemd/system/superset.service'],
+      ],
     }
   }
 }