diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/cloud-install/tasks/install_hcloud.yml | 2 | ||||
| -rw-r--r-- | roles/cloud-install/tasks/install_hroot.yml | 2 | ||||
| -rw-r--r-- | roles/cloud-install/tasks/main.yml | 12 |
3 files changed, 5 insertions, 11 deletions
diff --git a/roles/cloud-install/tasks/install_hcloud.yml b/roles/cloud-install/tasks/install_hcloud.yml index 455d832e..68e8db60 100644 --- a/roles/cloud-install/tasks/install_hcloud.yml +++ b/roles/cloud-install/tasks/install_hcloud.yml @@ -58,7 +58,7 @@ delay: 30 timeout: 120 -- import_tasks: hetzner_installimage.yml +- include_tasks: hetzner_installimage.yml - name: reboot shell: sleep 2 && shutdown -r now "triggered by ansible after running installimage" diff --git a/roles/cloud-install/tasks/install_hroot.yml b/roles/cloud-install/tasks/install_hroot.yml index 1a8aeeaf..6c57d874 100644 --- a/roles/cloud-install/tasks/install_hroot.yml +++ b/roles/cloud-install/tasks/install_hroot.yml @@ -99,7 +99,7 @@ delay: 30 timeout: 120 -- import_tasks: hetzner_installimage.yml +- include_tasks: hetzner_installimage.yml - name: reboot shell: sleep 2 && shutdown -r now "triggered by ansible after running installimage" diff --git a/roles/cloud-install/tasks/main.yml b/roles/cloud-install/tasks/main.yml index 94265382..6d9eb96e 100644 --- a/roles/cloud-install/tasks/main.yml +++ b/roles/cloud-install/tasks/main.yml @@ -1,14 +1,8 @@ --- -- include_tasks: "{{ item }}" - with_first_found: - - files: - - "install_{{ cloud_provider }}.yml" +- include_tasks: "install_{{ cloud_provider }}.yml" - name: force facts cache to get updated setup: -- include_tasks: "{{ item }}" - with_first_found: - - files: - - "post_{{ cloud_provider }}.yml" - skip: true +- when: lookup('first_found', ['post_' + cloud_provider + '.yml'], errors='ignore') + include_tasks: "post_{{ cloud_provider }}.yml" |