diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-05-23 07:50:16 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-05-25 00:04:27 +0200 |
| commit | 2a442070a042e2e27a64a6c4119df7a7fd635798 (patch) | |
| tree | 863245e72fb011ea375c4230a341e947d9bce900 /common | |
| parent | major revamp for zfs based vm images (diff) | |
sk-tomnext and both VMs running on it are finally done
Diffstat (limited to 'common')
| -rw-r--r-- | common/cloud-install.yml | 16 | ||||
| -rw-r--r-- | common/vm-install.yml | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/common/cloud-install.yml b/common/cloud-install.yml index e21d4bf1..414cabd1 100644 --- a/common/cloud-install.yml +++ b/common/cloud-install.yml @@ -29,14 +29,6 @@ roles: - role: cloud/post-install -- name: run host playbook - vars: - params: - files: - - "../{{ install_environment }}/{{ install_hostname }}.yml" - - "../{{ install_environment }}/{{ install_playbook | default('common') }}.yml" - import_playbook: "{{ q('first_found', params) | first }}" - - name: reboot and wait for machine come back hosts: "{{ install_hostname }}" gather_facts: no @@ -44,3 +36,11 @@ - role: reboot-and-wait reboot_delay: 10 reboot_timeout: 120 + +- name: run host playbook + vars: + params: + files: + - "../{{ install_environment }}/{{ install_hostname }}.yml" + - "../{{ install_environment }}/{{ install_playbook | default('common') }}.yml" + import_playbook: "{{ q('first_found', params) | first }}" diff --git a/common/vm-install.yml b/common/vm-install.yml index d449926e..7aaf32fc 100644 --- a/common/vm-install.yml +++ b/common/vm-install.yml @@ -58,14 +58,6 @@ - role: vm/guest when: install_distro in ['debian', 'ubuntu'] -- name: run host playbook - vars: - params: - files: - - "../{{ install_environment }}/{{ install_hostname }}.yml" - - "../{{ install_environment }}/{{ install_playbook | default('common') }}.yml" - import_playbook: "{{ q('first_found', params) | first }}" - - name: reboot and wait for VM come back hosts: "{{ install_hostname }}" gather_facts: no @@ -73,3 +65,11 @@ - role: reboot-and-wait reboot_delay: 10 reboot_timeout: 120 + +- name: run host playbook + vars: + params: + files: + - "../{{ install_environment }}/{{ install_hostname }}.yml" + - "../{{ install_environment }}/{{ install_playbook | default('common') }}.yml" + import_playbook: "{{ q('first_found', params) | first }}" |