summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-12-06 10:14:00 +0100
committerSuren A. Chilingaryan <csa@suren.me>2019-12-06 10:14:00 +0100
commitbdcf77c2a664de34014a21913a3d3a0474f9bbba (patch)
tree2a4e682fdc0cc4bbc1bdc81d3e171e27fe389049
parent68a90c3b962af76a4b1390e097a2f3d848ca6643 (diff)
downloadands-bdcf77c2a664de34014a21913a3d3a0474f9bbba.tar.gz
ands-bdcf77c2a664de34014a21913a3d3a0474f9bbba.tar.bz2
ands-bdcf77c2a664de34014a21913a3d3a0474f9bbba.tar.xz
ands-bdcf77c2a664de34014a21913a3d3a0474f9bbba.zip
Compatibility fixes with ansible 2.8
-rw-r--r--roles/ands_facts/tasks/nodes.yml6
-rw-r--r--roles/ands_facts/tasks/volumes.yml6
-rw-r--r--roles/ands_kaas/tasks/do_apps.yml5
-rw-r--r--roles/ands_kaas/tasks/project.yml8
-rw-r--r--roles/ands_openshift/tasks/heketi_resources.yml6
-rw-r--r--roles/ands_openshift/tasks/projects.yml6
-rw-r--r--roles/ands_openshift/tasks/security.yml6
-rw-r--r--roles/ands_openshift/tasks/ssh.yml6
-rw-r--r--roles/ands_openshift/tasks/storage.yml6
-rw-r--r--roles/ands_openshift/tasks/users.yml6
-rw-r--r--roles/glusterfs/tasks/iterate_domains.yml6
-rw-r--r--roles/glusterfs/tasks/volumes.yml6
12 files changed, 49 insertions, 24 deletions
diff --git a/roles/ands_facts/tasks/nodes.yml b/roles/ands_facts/tasks/nodes.yml
index d9f61df..822b380 100644
--- a/roles/ands_facts/tasks/nodes.yml
+++ b/roles/ands_facts/tasks/nodes.yml
@@ -1,7 +1,9 @@
- name: Process all nodes
include_tasks: "node.yml"
- run_once: true
- delegate_to: "{{ groups['masters'][0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups['masters'][0] }}"
with_dict: "{{ hostvars }}"
when: host.key in groups['ands']
vars:
diff --git a/roles/ands_facts/tasks/volumes.yml b/roles/ands_facts/tasks/volumes.yml
index 616202c..7bbba49 100644
--- a/roles/ands_facts/tasks/volumes.yml
+++ b/roles/ands_facts/tasks/volumes.yml
@@ -1,7 +1,9 @@
- name: Process all storage domains
include_tasks: "volumes_iterate.yml"
- run_once: true
- delegate_to: "{{ groups[domain.servers][0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups[domain.servers][0] }}"
with_items: "{{ ands_local_storage_domains | default([]) | union(ands_storage_domains) }}"
loop_control:
loop_var: domain
diff --git a/roles/ands_kaas/tasks/do_apps.yml b/roles/ands_kaas/tasks/do_apps.yml
index 5883ff8..9c57128 100644
--- a/roles/ands_kaas/tasks/do_apps.yml
+++ b/roles/ands_kaas/tasks/do_apps.yml
@@ -6,8 +6,8 @@
loop_var: appitem
when:
- appitem.value.provision | default(true)
- - (ands_configure_app == ands_none) or (appname == ands_configure_app)
- - appname | match(kaas_app_regexp | default(.*))
+ - (configure_app == ands_none) or (appname == configure_app)
+ - appname | match(kaas_app_regexp | default('.*'))
vars:
app: "{{ kaas_project_config[appitem.key] }}"
appname: "{{ app.name | default(appitem.key) | regex_replace('_','-') }}"
@@ -19,3 +19,4 @@
pods: "{{ app.pods | default({}) }}"
builders: "{{ app.builders | default({}) }}"
parameters: "{{ app.parameters | default({}) }}"
+ configure_app: "{{ ands_configure_app | default(ands_none) }}" \ No newline at end of file
diff --git a/roles/ands_kaas/tasks/project.yml b/roles/ands_kaas/tasks/project.yml
index 149a102..5a83dff 100644
--- a/roles/ands_kaas/tasks/project.yml
+++ b/roles/ands_kaas/tasks/project.yml
@@ -22,14 +22,18 @@
- name: Get information about block volumes
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ delegate_to: "{{ groups.masters[0] }}"
shell: gluster-block info {{ item.value.volume }}/{{ item.key }} | grep -oP '^GBID:\s*\K.*'
register: iqn_info
with_dict: "{{ kaas_block_volumes }}"
when: item.value.project == kaas_project
- name: Get more information about block volumes
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ delegate_to: "{{ groups.masters[0] }}"
shell: gluster-block info {{ item.value.volume }}/{{ item.key }} | grep -oP '^EXPORTED NODE.*:\s*\K.*' | tr ' ' '\n'
register: portal_info
with_dict: "{{ kaas_block_volumes }}"
diff --git a/roles/ands_openshift/tasks/heketi_resources.yml b/roles/ands_openshift/tasks/heketi_resources.yml
index 4abb411..0b0d0d3 100644
--- a/roles/ands_openshift/tasks/heketi_resources.yml
+++ b/roles/ands_openshift/tasks/heketi_resources.yml
@@ -38,8 +38,10 @@
- name: Fix GlusterFS volume permissions
include_tasks: heketi_perms.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
when: (result | changed)
- name: Copy Heketi Template
diff --git a/roles/ands_openshift/tasks/projects.yml b/roles/ands_openshift/tasks/projects.yml
index 4f13136..e3ed02e 100644
--- a/roles/ands_openshift/tasks/projects.yml
+++ b/roles/ands_openshift/tasks/projects.yml
@@ -1,4 +1,6 @@
---
- include_tasks: projects_resources.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
diff --git a/roles/ands_openshift/tasks/security.yml b/roles/ands_openshift/tasks/security.yml
index b1f017b..f4e68f4 100644
--- a/roles/ands_openshift/tasks/security.yml
+++ b/roles/ands_openshift/tasks/security.yml
@@ -1,3 +1,5 @@
- include_tasks: security_resources.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
diff --git a/roles/ands_openshift/tasks/ssh.yml b/roles/ands_openshift/tasks/ssh.yml
index e8cb8d1..97f3926 100644
--- a/roles/ands_openshift/tasks/ssh.yml
+++ b/roles/ands_openshift/tasks/ssh.yml
@@ -8,8 +8,10 @@
failed_when: false
- include_tasks: ssh_keygen.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
when: (result | changed)
- name: Read SSH public key
diff --git a/roles/ands_openshift/tasks/storage.yml b/roles/ands_openshift/tasks/storage.yml
index 66f0855..0454498 100644
--- a/roles/ands_openshift/tasks/storage.yml
+++ b/roles/ands_openshift/tasks/storage.yml
@@ -1,4 +1,6 @@
---
- include_tasks: storage_resources.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
diff --git a/roles/ands_openshift/tasks/users.yml b/roles/ands_openshift/tasks/users.yml
index a692a24..8c0beab 100644
--- a/roles/ands_openshift/tasks/users.yml
+++ b/roles/ands_openshift/tasks/users.yml
@@ -4,5 +4,7 @@
when: "'masters' in group_names"
- include_tasks: users_resources.yml
- run_once: true
- delegate_to: "{{ groups.masters[0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups.masters[0] }}"
diff --git a/roles/glusterfs/tasks/iterate_domains.yml b/roles/glusterfs/tasks/iterate_domains.yml
index e061652..7378e34 100644
--- a/roles/glusterfs/tasks/iterate_domains.yml
+++ b/roles/glusterfs/tasks/iterate_domains.yml
@@ -1,7 +1,9 @@
- name: Process all storage domains
include_tasks: "iterate_volumes.yml"
- run_once: true
- delegate_to: "{{ groups[domain.servers][0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups[domain.servers][0] }}"
with_items: "{{ glusterfs_domains }}"
loop_control:
loop_var: domain
diff --git a/roles/glusterfs/tasks/volumes.yml b/roles/glusterfs/tasks/volumes.yml
index 1a85378..96363b8 100644
--- a/roles/glusterfs/tasks/volumes.yml
+++ b/roles/glusterfs/tasks/volumes.yml
@@ -1,7 +1,9 @@
- name: Configure volume domains
include_tasks: create_domain.yml
- run_once: true
- delegate_to: "{{ groups[domain.servers][0] }}"
+ args:
+ apply:
+ run_once: true
+ delegate_to: "{{ groups[domain.servers][0] }}"
with_items: "{{ glusterfs_domains }}"
loop_control:
loop_var: domain