From d90144d2190009f8bd121cb8f773a9209500f034 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 1 Jan 2022 20:19:56 +0100 Subject: in-place variable cooking --- chaos-at-home/cloud-install.yml | 4 ++-- chaos-at-home/generic.yml | 6 ------ chaos-at-home/iso-generate.yml | 4 ++-- chaos-at-home/iso-install.yml | 4 ++-- chaos-at-home/k8s-chtest.yml | 4 ++-- chaos-at-home/usb-generate.yml | 4 ++-- chaos-at-home/usb-install.yml | 4 ++-- chaos-at-home/vm-install.yml | 6 +++--- 8 files changed, 15 insertions(+), 21 deletions(-) (limited to 'chaos-at-home') diff --git a/chaos-at-home/cloud-install.yml b/chaos-at-home/cloud-install.yml index 31c757a1..1a7b26c0 100644 --- a/chaos-at-home/cloud-install.yml +++ b/chaos-at-home/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/chaos-at-home/generic.yml b/chaos-at-home/generic.yml index 9a495ffb..bc8866c5 100644 --- a/chaos-at-home/generic.yml +++ b/chaos-at-home/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/chaos-at-home/iso-generate.yml b/chaos-at-home/iso-generate.yml index 2f0c8345..59a077ae 100644 --- a/chaos-at-home/iso-generate.yml +++ b/chaos-at-home/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/chaos-at-home/iso-install.yml b/chaos-at-home/iso-install.yml index 0ae125a2..91dfca9e 100644 --- a/chaos-at-home/iso-install.yml +++ b/chaos-at-home/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/chaos-at-home/k8s-chtest.yml b/chaos-at-home/k8s-chtest.yml index 66e28426..5f7c830e 100644 --- a/chaos-at-home/k8s-chtest.yml +++ b/chaos-at-home/k8s-chtest.yml @@ -21,10 +21,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/chaos-at-home/usb-generate.yml b/chaos-at-home/usb-generate.yml index 3340d93b..12582abe 100644 --- a/chaos-at-home/usb-generate.yml +++ b/chaos-at-home/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/chaos-at-home/usb-install.yml b/chaos-at-home/usb-install.yml index 04bf2594..ae948707 100644 --- a/chaos-at-home/usb-install.yml +++ b/chaos-at-home/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/chaos-at-home/vm-install.yml b/chaos-at-home/vm-install.yml index 7d8e7320..7db00cba 100644 --- a/chaos-at-home/vm-install.yml +++ b/chaos-at-home/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 -- cgit v1.2.3