Zeppelin: add dependencies.

defaults/main.yml

@@ -1,20 +1,8 @@
 ---
-cdh_zeppelin_node: False
 cdh_zeppelin_version: 0.8.2
 cdh_zeppelin_home: /srv/zeppelin
-cdh_zeppelin_work_dirs:
-  - '{{ cdh_zeppelin_home }}/notebook'
-  - '{{ cdh_zeppelin_home }}/log'
-  - '{{ cdh_zeppelin_home }}/run'
-  - '{{ cdh_zeppelin_home }}/base_tmp/tmp'
-
-cdh_zeppelin_conf_files:
-  - zeppelin-env.sh
-  - shiro.ini
-  - zeppelin-site.xml
 cdh_zeppelin_ldap_auth: False
 cdh_zeppelin_notebook_public: 'false'
-cdh_zeppelin_dedicated_node: False
 cdh_zeppelin_use_spark2: '{{ cdh_spark2_enabled }}'
 
 cdh_impala_load_balancer: False

meta/main.yml

@@ -16,17 +16,30 @@ galaxy_info:
     - name: Ubuntu
       versions:
         - bionic
+    - name: EL
+      versions:
+        - 7
 
   galaxy_tags:
     - hadoop
     - bigdata
+    - zeppelin
+    - notebook
 
 dependencies:
   - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-openjdk.git
     version: master
     name: openjdk
     state: latest
+  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-hadoop-cdh.git
+    version: master
+    name: openjdk
+    state: latest
   - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-nginx.git
     version: master
     name: nginx
     state: latest
+  - src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-letsencrypt-acme-sh-client.git
+    version: master
+    name: letsencrypt-acme-sh-client
+    state: latest

tasks/main.yml

@@ -1,3 +1,2 @@
 ---
 - import_tasks: zeppelin.yml
-  when: cdh_zeppelin_node

tasks/zeppelin.yml

@@ -27,10 +27,6 @@
     notify: Restart zeppelin
     tags: [ 'cdh', 'zeppelin', 'zeppelin_conf' ]
 
-  - name: Install the zeppelin upstart startup script
-    template: src=zeppelin_upstart.conf dest=/etc/init/zeppelin.conf
-    when: ansible_service_mgr != 'systemd'
-
   - name: Install the zeppelin systemd startup script
     template: src=zeppelin_systemd.service dest=/etc/systemd/system/zeppelin.service
     when: ansible_service_mgr == 'systemd'
@@ -38,9 +34,19 @@
   - name: Ensure that the zeppelin service is enabled and running
     service: name=zeppelin state=started enabled=yes
 
-  - name: Ensure that apache2 installed by CDM is stopped and disabled
+  - name: Get the installed packages list
+    package_facts:
+      manager: "auto"
+    when: cdh_manager_install
+
+  - name: Stop and disable the apache service on Deb/Ubuntu
     service: name=apache2 state=stopped enabled=no
-    ignore_errors: True
+    when: "'apache2' in ansible_facts.packages"
+    notify: Restart nginx
+
+  - name: Stop and disable the apache service on EL
+    service: name=httpd state=stopped enabled=no
+    when: "'httpd' in ansible_facts.packages"
     notify: Restart nginx
 
   tags: [ 'cdh', 'zeppelin' ]

vars/main.yml

@@ -1,5 +1,16 @@
 ---
 letsencrypt_acme_install: True
+cdh_zeppelin_work_dirs:
+  - '{{ cdh_zeppelin_home }}/notebook'
+  - '{{ cdh_zeppelin_home }}/log'
+  - '{{ cdh_zeppelin_home }}/run'
+  - '{{ cdh_zeppelin_home }}/base_tmp/tmp'
+
+cdh_zeppelin_conf_files:
+  - zeppelin-env.sh
+  - shiro.ini
+  - zeppelin-site.xml
+
 zeppelin_http_port: 80
 zeppelin_https_port: 443