[issue_6]

- scope['variable'] added (https://puppet.com/docs/puppet/5.3/lang_template_erb.html#scopevariable-or-scopelookupvarvariable)
- new variable 'celery_ssl_active = false' for proper celary startup
- puppet-lint fixes
- contain in the init.pp for proper ordering

Author: kherbik

manifests/config.pp

@@ -8,8 +8,8 @@
     ensure => 'present',
     name   => $airflow::group,
     gid    => $airflow::gid,
-  } ->
-  user { $airflow::user:
+  }
+  -> user { $airflow::user:
     ensure     => 'present',
     shell      => $airflow::shell,
     managehome => true,
@@ -49,4 +49,4 @@
     mode    => '0755',
     require =>  Python::Pip[$airflow::package_name]
   }
-}
+}

manifests/init.pp

@@ -251,7 +251,7 @@
        ${::operatingsystem} Release: ${::operatingsystemmajrelease}")
   }
 
-  include airflow::config,
-          airflow::install
+  contain airflow::config
+  contain airflow::install
 
 }

manifests/params.pp

@@ -17,7 +17,7 @@
   $shell                     = '/bin/bash'
   $gid                       = undef
   $uid                       = undef
-  $folders_mode              = 0775
+  $folders_mode              = '0775'
 
   # General settings
   $log_folder                = '/var/log/airflow'
@@ -72,7 +72,7 @@
   ## Scheduler settings
   $job_heartbeat_sec         = 5
   $scheduler_heartbeat_sec   = 5
-  
+
   ### START hiera lookups ###
   $ldap_settings             = {}
   $statsd_settings           = {}

manifests/resource/service.pp

@@ -8,8 +8,8 @@
     group   => 'root',
     content => template("${module_name}/${service_name}.service.erb"),
     require => [Python::Pip[$airflow::package_name], File[$airflow::log_folder]]
-  } ~>
-  Exec['systemctl-daemon-reload']
+  }
+  ~> Exec['systemctl-daemon-reload']
   service { $service_name:
     ensure    => $airflow::service_ensure,
     enable    => $airflow::service_enable,

templates/airflow-flower.service.erb

@@ -4,14 +4,14 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-Environment="AIRFLOW_HOME=<%= @home_folder %>"
-User=<%= @user %>
-Group=<%= @group %>
+Environment="AIRFLOW_HOME=<%= scope['airflow::home_folder'] %>"
+User=<%= scope['airflow::user'] %>
+Group=<%= scope['airflow::group'] %>
 Type=simple
 ExecStart=/bin/airflow flower
 KillMode=process
 Restart=on-failure
 RestartSec=15s
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

templates/airflow-scheduler.service.erb

@@ -4,15 +4,15 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-PIDFile = <%= @run_folder %>/airflow_scheduler.pid
+PIDFile = <%= scope['airflow::run_folder'] %>/airflow_scheduler.pid
 ExecStart=/usr/bin/airflow scheduler
 ExecReload=/bin/kill -HUP $MAINPID
-Environment="AIRFLOW_HOME=<%= @home_folder %>"
+Environment="AIRFLOW_HOME=<%= scope['airflow::home_folder'] %>"
 KillMode=process
 Restart=on-failure
 RestartSec=15s
-User=<%= @user %>
-Group=<%= @group %>
+User=<%= scope['airflow::user'] %>
+Group=<%= scope['airflow::group'] %>
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

templates/airflow-webserver.service.erb

@@ -4,20 +4,15 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-PIDFile = <%= @run_folder %>/airflow_webserver.pid
-ExecStart=/usr/bin/gunicorn -w <%= @gunicorn_workers %> -t 120 -b <%= @web_server_host %>:<%= @web_server_port %> airflow.www.app:cached_app()
+PIDFile = <%= scope['airflow::run_folder'] %>/airflow_webserver.pid
+ExecStart=/usr/bin/gunicorn -w <%= scope['airflow::gunicorn_workers'] %> -t 120 -b <%= scope['airflow::web_server_host'] %>:<%= scope['airflow::web_server_port'] %> airflow.www.app:cached_app()
 ExecReload=/bin/kill -HUP $MAINPID
-Environment="AIRFLOW_HOME=<%= @home_folder %>"
+Environment="AIRFLOW_HOME=<%= scope['airflow::home_folder'] %>"
 KillMode=process
 Restart=on-failure
 RestartSec=15s
-User=<%= @user %>
-Group=<%= @group %>
+User=<%= scope['airflow::user'] %>
+Group=<%= scope['airflow::group'] %>
 
 [Install]
 WantedBy=multi-user.target
-
-
-
-
-

templates/airflow-worker.service.erb

@@ -4,15 +4,15 @@ Wants=basic.target
 After=basic.target network.target
 
 [Service]
-PIDFile = <%= @run_folder %>/airflow_worker.pid
+PIDFile = <%= scope['airflow::run_folder'] %>/airflow_worker.pid
 ExecStart=/usr/bin/airflow worker
 ExecReload=/bin/kill -HUP $MAINPID
-Environment="AIRFLOW_HOME=<%= @home_folder %>"
+Environment="AIRFLOW_HOME=<%= scope['airflow::home_folder'] %>"
 KillMode=process
 Restart=on-failure
 RestartSec=15s
-User=<%= @user %>
-Group=<%= @group %>
+User=<%= scope['airflow::user'] %>
+Group=<%= scope['airflow::group'] %>
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

templates/airflow.cfg.erb

@@ -112,6 +112,18 @@ smtp_mail_from = <%= @smtp_mail_from %>
 # This section only applies if you are using the CeleryExecutor in
 # [core] section above
 
+# Enable / Disable CeleryExecutor with SSL. 
+# Ensure you properly generate client and server certs and keys.
+#
+# TODO:
+# * configure 'celery_ssl_active' by params
+# * setup an SSL key and certs
+#
+# celery_ssl_cacert = <%= @celery_ssl_cacert %>
+# celery_ssl_cert = <%= @celery_ssl_cert %>
+# celery_ssl_key = <%= @celery_ssl_key %>
+celery_ssl_active = false
+
 # The app name that will be used by celery
 celery_app_name = <%= @celery_app_name %>
 
@@ -202,4 +214,4 @@ authenticate = <%= @mesos_settings['authenticate'] %>
  default_principal = <%= @mesos_settings['default_principal'] %> 
  default_secret =  <%= @mesos_settings['default_secret'] %>
 <% end %>
-<% end %>
+<% end %>