summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2019-02-25 19:43:08 +0100
committerChristian Pointner <equinox@spreadspace.org>2019-02-25 19:43:08 +0100
commit62f426e53aeccecb99f99afcb2e66659533da1e2 (patch)
tree97152d8dc95af87e42571add7a84b5a164432e8b
parentap for uhrturm (diff)
fix usb/vm-install
-rw-r--r--chaos-at-home/usb-install.yml8
-rw-r--r--chaos-at-home/vm-install.yml8
-rw-r--r--common/usb-install.yml4
-rw-r--r--common/vm-install.yml4
-rw-r--r--dan/usb-install.yml8
-rw-r--r--dan/vm-install.yml8
-rw-r--r--spreadspace/usb-install.yml8
-rw-r--r--spreadspace/vm-install.yml8
8 files changed, 49 insertions, 7 deletions
diff --git a/chaos-at-home/usb-install.yml b/chaos-at-home/usb-install.yml
index 7912f21a..b7a1c8be 100644
--- a/chaos-at-home/usb-install.yml
+++ b/chaos-at-home/usb-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/usb-install.yml
diff --git a/chaos-at-home/vm-install.yml b/chaos-at-home/vm-install.yml
index b5d8bf2e..99d1558d 100644
--- a/chaos-at-home/vm-install.yml
+++ b/chaos-at-home/vm-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/vm-install.yml
diff --git a/common/usb-install.yml b/common/usb-install.yml
index 143cacaa..729b9387 100644
--- a/common/usb-install.yml
+++ b/common/usb-install.yml
@@ -1,5 +1,5 @@
---
-- name: Fetch debian installer and bake initrd
+- name: fetch debian installer and bake initrd
hosts: "{{ hostname }}"
connection: local
gather_facts: no
@@ -12,8 +12,6 @@
pre_tasks:
- set_fact:
- install_cooked: "{{ install }}"
- network_cooked: "{{ network }}"
artifacts_dir: "{{ global_artifacts_dir }}/{{ hostname }}"
debian_installer_path: "{{ global_cache_dir }}/debian-installer"
diff --git a/common/vm-install.yml b/common/vm-install.yml
index 5cc2a1c3..fd1dbb20 100644
--- a/common/vm-install.yml
+++ b/common/vm-install.yml
@@ -3,10 +3,6 @@
hosts: "{{ hostname }}"
gather_facts: no
tasks:
- - name: setup variables
- set_fact:
- network_cooked: "{{ network }}"
- install_cooked: "{{ install }}"
- name: create temporary host group for vm host
add_host:
name: "{{ vm_host }}"
diff --git a/dan/usb-install.yml b/dan/usb-install.yml
index 7912f21a..b7a1c8be 100644
--- a/dan/usb-install.yml
+++ b/dan/usb-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/usb-install.yml
diff --git a/dan/vm-install.yml b/dan/vm-install.yml
index b5d8bf2e..99d1558d 100644
--- a/dan/vm-install.yml
+++ b/dan/vm-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/vm-install.yml
diff --git a/spreadspace/usb-install.yml b/spreadspace/usb-install.yml
index 7912f21a..b7a1c8be 100644
--- a/spreadspace/usb-install.yml
+++ b/spreadspace/usb-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/usb-install.yml
diff --git a/spreadspace/vm-install.yml b/spreadspace/vm-install.yml
index b5d8bf2e..99d1558d 100644
--- a/spreadspace/vm-install.yml
+++ b/spreadspace/vm-install.yml
@@ -1,2 +1,10 @@
---
+- name: setup variables
+ hosts: "{{ hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install_cooked: "{{ install }}"
+ network_cooked: "{{ network }}"
+
- import_playbook: ../common/vm-install.yml