in-place variable cooking

8 files changed, 15 insertions, 21 deletions

diff --git a/spreadspace/cloud-install.yml b/spreadspace/cloud-install.yml
index 31c757a1..1a7b26c0 100644
--- a/spreadspace/cloud-install.yml
+++ b/spreadspace/cloud-install.yml
@@ -4,7 +4,7 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
 
 - import_playbook: ../common/cloud-install.yml
diff --git a/spreadspace/generic.yml b/spreadspace/generic.yml
index 9a495ffb..bc8866c5 100644
--- a/spreadspace/generic.yml
+++ b/spreadspace/generic.yml
@@ -1,11 +1,5 @@
 ---
 - name: "Apply role {{ myrole }} to hosts: {{ myhosts }}"
   hosts: "{{ myhosts }}"
-  pre_tasks:
-  - name: cook some variables for roles that expect them to be cooked
-    set_fact:
-      install_cooked: "{{ install | default({}) }}"
-      network_cooked: "{{ network | default({}) }}"
-      vm_host_cooked: "{{ vm_host | default({}) }}"
   roles:
   - role: "{{ myrole }}"
diff --git a/spreadspace/iso-generate.yml b/spreadspace/iso-generate.yml
index 2f0c8345..59a077ae 100644
--- a/spreadspace/iso-generate.yml
+++ b/spreadspace/iso-generate.yml
@@ -4,7 +4,7 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
 
 - import_playbook: ../common/iso-generate.yml
diff --git a/spreadspace/iso-install.yml b/spreadspace/iso-install.yml
index 0ae125a2..91dfca9e 100644
--- a/spreadspace/iso-install.yml
+++ b/spreadspace/iso-install.yml
@@ -4,7 +4,7 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
 
 - import_playbook: ../common/iso-install.yml
diff --git a/spreadspace/k8s-lwl.yml b/spreadspace/k8s-lwl.yml
index 01801633..1aa09daa 100644
--- a/spreadspace/k8s-lwl.yml
+++ b/spreadspace/k8s-lwl.yml
@@ -20,10 +20,10 @@
   gather_facts: no
   tasks:
   - set_fact:
-      kubernetes_secrets_cooked: "{{ kubernetes_secrets }}"
+      kubernetes_secrets: "{{ kubernetes_secrets }}"
   - when: external_ip is defined
     set_fact:
-      external_ip_cooked: "{{ external_ip }}"
+      external_ip: "{{ external_ip }}"
 
 - import_playbook: ../common/kubernetes-cluster.yml
 - import_playbook: ../common/kubernetes-cluster-cleanup.yml
diff --git a/spreadspace/usb-generate.yml b/spreadspace/usb-generate.yml
index 3340d93b..12582abe 100644
--- a/spreadspace/usb-generate.yml
+++ b/spreadspace/usb-generate.yml
@@ -4,7 +4,7 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
 
 - import_playbook: ../common/usb-generate.yml
diff --git a/spreadspace/usb-install.yml b/spreadspace/usb-install.yml
index 04bf2594..ae948707 100644
--- a/spreadspace/usb-install.yml
+++ b/spreadspace/usb-install.yml
@@ -4,7 +4,7 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
 
 - import_playbook: ../common/usb-install.yml
diff --git a/spreadspace/vm-install.yml b/spreadspace/vm-install.yml
index 7d8e7320..7db00cba 100644
--- a/spreadspace/vm-install.yml
+++ b/spreadspace/vm-install.yml
@@ -4,8 +4,8 @@
   gather_facts: no
   tasks:
   - set_fact:
-      install_cooked: "{{ install }}"
-      network_cooked: "{{ network }}"
-      vm_host_cooked: "{{ vm_host }}"
+      install: "{{ install }}"
+      network: "{{ network }}"
+      vm_host: "{{ vm_host }}"
 
 - import_playbook: ../common/vm-install.yml