diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 20:19:56 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2022-01-01 20:19:56 +0100 |
| commit | d90144d2190009f8bd121cb8f773a9209500f034 (patch) | |
| tree | 2d258279d2179afc58fd91c741e0b5fa56246c9f /dan | |
| parent | Merge branch 'topic/revamp-openwrt-imag-gen' (diff) | |
in-place variable cooking
Diffstat (limited to 'dan')
| -rw-r--r-- | dan/cloud-install.yml | 4 | ||||
| -rw-r--r-- | dan/generic.yml | 6 | ||||
| -rw-r--r-- | dan/iso-generate.yml | 4 | ||||
| -rw-r--r-- | dan/iso-install.yml | 4 | ||||
| -rw-r--r-- | dan/k8s-emc.yml | 4 | ||||
| -rw-r--r-- | dan/usb-generate.yml | 4 | ||||
| -rw-r--r-- | dan/usb-install.yml | 4 | ||||
| -rw-r--r-- | dan/vm-install.yml | 6 |
8 files changed, 15 insertions, 21 deletions
diff --git a/dan/cloud-install.yml b/dan/cloud-install.yml index 31c757a1..1a7b26c0 100644 --- a/dan/cloud-install.yml +++ b/dan/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/dan/generic.yml b/dan/generic.yml index 9a495ffb..bc8866c5 100644 --- a/dan/generic.yml +++ b/dan/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/dan/iso-generate.yml b/dan/iso-generate.yml index 2f0c8345..59a077ae 100644 --- a/dan/iso-generate.yml +++ b/dan/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/dan/iso-install.yml b/dan/iso-install.yml index 0ae125a2..91dfca9e 100644 --- a/dan/iso-install.yml +++ b/dan/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/dan/k8s-emc.yml b/dan/k8s-emc.yml index 92cc909a..96b61066 100644 --- a/dan/k8s-emc.yml +++ b/dan/k8s-emc.yml @@ -22,10 +22,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/dan/usb-generate.yml b/dan/usb-generate.yml index 3340d93b..12582abe 100644 --- a/dan/usb-generate.yml +++ b/dan/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/dan/usb-install.yml b/dan/usb-install.yml index 04bf2594..ae948707 100644 --- a/dan/usb-install.yml +++ b/dan/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/dan/vm-install.yml b/dan/vm-install.yml index 7d8e7320..7db00cba 100644 --- a/dan/vm-install.yml +++ b/dan/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 |