updating airflow vars & conns task to delete select variables being u…

…pdated
tulibraries · Apr 10, 2019 · ffbe2ba · ffbe2ba
1 parent 561620e
commit ffbe2ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -245,12 +245,14 @@ airflow_webserver_admins:
     airflow_dummy_password: "dummy-password"
 
 # Connections management
-airflow_drop_existing_connections_before_add: True
-airflow_connections: []
+airflow_connections:
+  - conn_id: "ANSIBLE_TEST"
+    conn_uri: "http://localhost:9999"
 
 # Variables management
-airflow_drop_existing_variables_before_add: True
-airflow_variables: []
+airflow_variables:
+  - key: "ANSIBLE_TEST"
+    value: "test_value"
 
 # Logrotate configuration
 airflow_logrotate_config:

diff --git a/tasks/manage_airflow_variables.yml b/tasks/manage_airflow_variables.yml
@@ -15,12 +15,12 @@
 
 
 # Only add and delete actions are managed, not update
-- name: 'CONFIG | VARIABLES | Remove existing variables'
+- name: 'CONFIG | VARIABLES | Remove listed variables'
   command: >
-    {{ airflow_virtualenv }}/bin/airflow variables --delete {{ item }}
+    {{ airflow_virtualenv }}/bin/airflow variables --delete {{ item.key }}
   changed_when: false
-  with_items: "{{ airflow_existing_variables.stdout_lines }}"
-  when: 'airflow_drop_existing_variables_before_add | bool'
+  with_items: "{{ airflow_variables }}"
+  when: 'item.key in airflow_existing_variables.stdout_lines'
 
 
 - name: 'CONFIG | VARIABLES | Add variables'

diff --git a/tasks/manage_connections.yml b/tasks/manage_connections.yml
@@ -16,12 +16,12 @@
 
 
 # Only add and delete actions are managed, not update
-- name: 'CONFIG | CONNECTIONS | Remove existing connections'
+- name: 'CONFIG | CONNECTIONS | Remove listed connections'
   command: >
-    {{ airflow_virtualenv }}/bin/airflow connections --delete --conn_id {{ item }}
+    {{ airflow_virtualenv }}/bin/airflow connections --delete --conn_id {{ item.conn_id }}
   changed_when: false
-  with_items: "{{ airflow_existing_connections.stdout_lines }}"
-  when: 'airflow_drop_existing_connections_before_add | bool'
+  with_items: "{{ airflow_connections }}"
+  when: 'item.conn_id in airflow_existing_connections.stdout_lines'
 
 
 - name: 'CONFIG | CONNECTIONS | Add connections without extra settings'
@@ -31,7 +31,7 @@
   changed_when: false
   no_log: True
   with_items: "{{ airflow_connections }}"
-  when: "(item.conn_extra | default('')) | length = 0"
+  when: "(item.conn_extra | default('')) | length == 0"
 
 
 - name: 'CONFIG | CONNECTIONS | Add connections with extra settings'