diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-01-02 14:05:59 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-01-02 14:05:59 +0100 |
| commit | ca8dd7b0534625b16376837c2ee737b48991606d (patch) | |
| tree | 8a6c6d3f3d0315636aafb995629d5aad4ec19c61 /common | |
| parent | prepare ch-dione and ch-helene for test kubernetes cluster (diff) | |
install playbooks: fix order handlers and reboot
Diffstat (limited to 'common')
| -rw-r--r-- | common/cloud-install.yml | 13 | ||||
| -rw-r--r-- | common/iso-install.yml | 14 | ||||
| -rw-r--r-- | common/usb-install.yml | 14 | ||||
| -rw-r--r-- | common/vm-install.yml | 13 |
4 files changed, 42 insertions, 12 deletions
diff --git a/common/cloud-install.yml b/common/cloud-install.yml index fbe0dd4f..38523bb0 100644 --- a/common/cloud-install.yml +++ b/common/cloud-install.yml @@ -26,15 +26,22 @@ roles: - role: cloud/post-install - - role: reboot-and-wait - reboot_delay: 10 - reboot_timeout: 120 post_tasks: - name: reenable StrictHostKeyChecking set_fact: ansible_ssh_extra_args: "" + - name: run all handlers before rebooting + meta: flush_handlers + + - name: reboot the new machine + vars: + reboot_delay: 10 + reboot_timeout: 120 + import_role: + name: reboot-and-wait + - name: run host playbook vars: diff --git a/common/iso-install.yml b/common/iso-install.yml index 1a211319..dea08b3a 100644 --- a/common/iso-install.yml +++ b/common/iso-install.yml @@ -55,15 +55,23 @@ # roles: # ### TODO: add role that configures networking - # - role: reboot-and-wait - # reboot_delay: 10 - # reboot_timeout: 120 post_tasks: - name: reenable StrictHostKeyChecking set_fact: ansible_ssh_extra_args: "" + - name: run all handlers before rebooting + meta: flush_handlers + + ### TODO: enable this once network config is done by ansible + # - name: reboot the new machine + # vars: + # reboot_delay: 10 + # reboot_timeout: 120 + # import_role: + # name: reboot-and-wait + - name: run host playbook vars: diff --git a/common/usb-install.yml b/common/usb-install.yml index a7d4e944..4ef69039 100644 --- a/common/usb-install.yml +++ b/common/usb-install.yml @@ -45,15 +45,23 @@ # roles: # ### TODO: add role that configures networking - # - role: reboot-and-wait - # reboot_delay: 10 - # reboot_timeout: 120 post_tasks: - name: reenable StrictHostKeyChecking set_fact: ansible_ssh_extra_args: "" + - name: run all handlers before rebooting + meta: flush_handlers + + ### TODO: enable this once network config is done by ansible + # - name: reboot the new machine + # vars: + # reboot_delay: 10 + # reboot_timeout: 120 + # import_role: + # name: reboot-and-wait + - name: run host playbook vars: diff --git a/common/vm-install.yml b/common/vm-install.yml index ce438905..f89ab6ba 100644 --- a/common/vm-install.yml +++ b/common/vm-install.yml @@ -48,15 +48,22 @@ when: install_distro in ['debian', 'ubuntu'] - role: vm/guest/base when: install_distro in ['debian', 'ubuntu'] - - role: reboot-and-wait - reboot_delay: 10 - reboot_timeout: 120 post_tasks: - name: reenable StrictHostKeyChecking set_fact: ansible_ssh_extra_args: "" + - name: run all handlers before rebooting + meta: flush_handlers + + - name: reboot the new machine + vars: + reboot_delay: 10 + reboot_timeout: 120 + import_role: + name: reboot-and-wait + - name: run host playbook vars: |