Merge pull request #122 from idealista/develop

Develop

.travis.yml

@@ -1,12 +1,12 @@
 ---
-dist: xenial
+dist: focal
 language: python
-python: "3.7"
+python: "3.9"
 os: linux
 services:
   - docker
 install:
-  - pip install pipenv
+  - pip install -I pipenv
   - pipenv sync
 env:
   jobs:

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
 ## [Unreleased](https://github.com/idealista/airflow-role/tree/develop)
+### Fixed
+- :hammer_and_wrench: Allow intalling only some services
+- :hammer_and_wrench: Updating travis environment
+
+### Changed
+
+- :arrows_clockwise: Moving copy tasks of services to service.yml
 
 ## [2.0.5](https://github.com/idealista/airflow-role/tree/2.0.5)
 

Pipfile

@@ -6,10 +6,10 @@ verify_ssl = true
 [dev-packages]
 
 [packages]
-ansible = "==2.9.21"
+ansible = "==2.9.27"
 molecule = "==3.0.8"
-docker = "==4.1.0"
+docker = "==4.4.4"
 ansible-lint = "==4.2.0"
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"

tasks/config.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: Airflow | Ensure airflow directories structure
   file:
     path: "{{ item }}"
@@ -31,10 +30,7 @@
   register: airflow_config
   when: airflow_version is version( '2.0.0', '>=')
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags: airflow-webserver-config-py
 
 - name: Airflow | Copy basic airflow config file (< 2.0)
@@ -47,10 +43,7 @@
   register: airflow_config
   when: airflow_version is version( '2.0.0', '<')
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags: airflow-cfg
 
 - name: Airflow | Copy basic airflow config file (>= 2.0)
@@ -63,10 +56,7 @@
   register: airflow_config
   when: airflow_version is version( '2.0.0', '>=')
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags: airflow-cfg
 
 - name: Airflow | Initializing DB < 2.0
@@ -77,10 +67,7 @@
     - airflow_version is version( '2.0.0', '<')
     - (airflow_install.changed or airflow_config.changed)
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags:
     - airflow-db-init
     - skip_ansible_lint
@@ -93,10 +80,7 @@
     - airflow_version is version( '2.0.0', '>=')
     - airflow_install.changed or airflow_config.changed
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags: airflow-db-init
 
 - name: Airflow | Copy extra airflow config files (provided by playbooks)
@@ -109,10 +93,7 @@
   with_fileglob:
     - "{{ airflow_extra_conf_path }}/*"
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
   tags: airflow-extra-config
 
 - name: Airflow | Copy extra airflow config templates (provided by playbooks)
@@ -125,10 +106,8 @@
   with_fileglob:
     - "{{ airflow_extra_conf_template_path }}/*"
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"
+
   tags: airflow-extra-config
 
 - name: Airflow | Add variables from configuration file

tasks/install.yml

@@ -146,24 +146,4 @@
   with_items: "{{ dags_dependencies }}"
   when: dags_dependencies is defined
   notify:
-    - restart airflow-webserver
-    - restart airflow-scheduler
-    - restart airflow-worker
-    - restart airflow-flower
-
-- name: Airflow | Copy Environment File
-  template:
-    src: airflow-environment-file.j2
-    dest: "{{ airflow_environment_file_folder }}/airflow"
-    mode: 0644
-    owner: "{{ airflow_user }}"
-    group: "{{ airflow_group }}"
-
-- name: Airflow | Copy Daemon scripts
-  template:
-    src: "{{ item.value.path }}"
-    dest: "/lib/systemd/system/{{ item.value.service_name }}.service"
-    mode: 0644
-  notify: restart {{ item.value.service_name }}
-  with_dict: "{{ airflow_services }}"
-  when: item.value.enabled
+    "{{ ['restart'] | product(airflow_services.values() | map(attribute='service_name')) | map('join', ' ') | list }}"

tasks/service.yml

@@ -1,11 +1,28 @@
 ---
 
+- name: Airflow | Copy Environment File
+  template:
+    src: airflow-environment-file.j2
+    dest: "{{ airflow_environment_file_folder }}/airflow"
+    mode: 0644
+    owner: "{{ airflow_user }}"
+    group: "{{ airflow_group }}"
+
+- name: Airflow | Copy Daemon scripts
+  template:
+    src: "{{ item.value.path }}"
+    dest: "/lib/systemd/system/{{ item.value.service_name }}.service"
+    mode: 0644
+  notify: restart {{ item.value.service_name }}
+  with_dict: "{{ airflow_services }}"
+  when: airflow_services is defined
+
 - name: Airflow | Configuring service
   systemd:
     name: "{{ item.value.service_name }}"
     state: "{{ item.value.state }}"
     enabled: "{{ item.value.enabled }}"
     daemon_reload: true
   with_dict: "{{ airflow_services }}"
-  when: item.value.enabled
+  when: airflow_services is defined
   changed_when: false