fix syntax issue
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Robert Kaussow 2020-10-03 16:59:36 +02:00
parent 15d3b1f929
commit bd53c2d502
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
2 changed files with 8 additions and 28 deletions

View File

@ -6,16 +6,9 @@
no_log: "{{ molecule_no_log }}"
tasks:
- name: Populate the instance config
block:
- name: Populate instance config from file
set_fact:
instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
skip_instances: false
rescue:
- name: Populate instance config when file missing
set_fact:
instance_conf: {}
skip_instances: true
set_fact:
instance_conf_file: "{{ lookup('file', molecule_instance_config, errors='ignore') | from_yaml }}"
instance_conf: "{{ instance_conf_file | default([]) }}"
- name: Destroy molecule instance(s)
hcloud_server:
@ -24,7 +17,6 @@
state: absent
register: server
loop: "{{ instance_conf }}"
when: not skip_instances
async: 7200
poll: 0
@ -61,9 +53,7 @@
hcloud_ssh_key:
name: "{{ instance_conf[0].ssh_key_name }}"
state: absent
when:
- not skip_instances
- (instance_conf | default([])) | length > 0 # must contain at least one instance
when: (instance_conf | default([])) | length > 0
# Mandatory configuration for Molecule to function.

View File

@ -6,16 +6,9 @@
no_log: "{{ molecule_no_log }}"
tasks:
- name: Populate the instance config
block:
- name: Populate instance config from file
set_fact:
instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
skip_instances: false
rescue:
- name: Populate instance config when file missing
set_fact:
instance_conf: {}
skip_instances: true
set_fact:
instance_conf_file: "{{ lookup('file', molecule_instance_config, errors='ignore') | from_yaml }}"
instance_conf: "{{ instance_conf_file | default([]) }}"
- name: Destroy molecule instance(s)
hcloud_server:
@ -24,7 +17,6 @@
state: absent
register: server
loop: "{{ instance_conf }}"
when: not skip_instances
async: 7200
poll: 0
@ -61,9 +53,7 @@
hcloud_ssh_key:
name: "{{ instance_conf[0].ssh_key_name }}"
state: absent
when:
- not skip_instances
- (instance_conf | default([])) | length > 0 # must contain at least one instance
when: (instance_conf | default([])) | length > 0
# Mandatory configuration for Molecule to function.