diff options
28 files changed, 39 insertions, 51 deletions
diff --git a/chaos-at-home/cloud-install.yml b/chaos-at-home/cloud-install.yml index 1a7b26c0..72db81d9 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: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/cloud-install.yml diff --git a/chaos-at-home/iso-generate.yml b/chaos-at-home/iso-generate.yml index 59a077ae..584b8914 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: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-generate.yml diff --git a/chaos-at-home/iso-install.yml b/chaos-at-home/iso-install.yml index 91dfca9e..5defe6d3 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: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-install.yml diff --git a/chaos-at-home/usb-generate.yml b/chaos-at-home/usb-generate.yml index 12582abe..7f633f1e 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: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-generate.yml diff --git a/chaos-at-home/usb-install.yml b/chaos-at-home/usb-install.yml index ae948707..0f62bc85 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: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-install.yml diff --git a/chaos-at-home/vm-install.yml b/chaos-at-home/vm-install.yml index 7db00cba..da6a29a5 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: "{{ install }}" - network: "{{ network }}" - vm_host: "{{ vm_host }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" + vm_host: "{{ vm_host | default({}) }}" - import_playbook: ../common/vm-install.yml diff --git a/dan/cloud-install.yml b/dan/cloud-install.yml index 1a7b26c0..72db81d9 100644 --- a/dan/cloud-install.yml +++ b/dan/cloud-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/cloud-install.yml diff --git a/dan/iso-generate.yml b/dan/iso-generate.yml index 59a077ae..584b8914 100644 --- a/dan/iso-generate.yml +++ b/dan/iso-generate.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-generate.yml diff --git a/dan/iso-install.yml b/dan/iso-install.yml index 91dfca9e..5defe6d3 100644 --- a/dan/iso-install.yml +++ b/dan/iso-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-install.yml diff --git a/dan/usb-generate.yml b/dan/usb-generate.yml index 12582abe..7f633f1e 100644 --- a/dan/usb-generate.yml +++ b/dan/usb-generate.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-generate.yml diff --git a/dan/usb-install.yml b/dan/usb-install.yml index ae948707..0f62bc85 100644 --- a/dan/usb-install.yml +++ b/dan/usb-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-install.yml diff --git a/dan/vm-install.yml b/dan/vm-install.yml index 7db00cba..da6a29a5 100644 --- a/dan/vm-install.yml +++ b/dan/vm-install.yml @@ -4,8 +4,8 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" - vm_host: "{{ vm_host }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" + vm_host: "{{ vm_host | default({}) }}" - import_playbook: ../common/vm-install.yml diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index d1912106..df2ac782 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -6,7 +6,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" diff --git a/inventory/group_vars/glt-live-misc/vars.yml b/inventory/group_vars/glt-live-misc/vars.yml index 1f34bd7d..c15801e3 100644 --- a/inventory/group_vars/glt-live-misc/vars.yml +++ b/inventory/group_vars/glt-live-misc/vars.yml @@ -4,7 +4,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} ssh_keys_root_extra: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/tPDEC1q6YIhKKYK3ioN+flmB2ACw0X7rew144g71jeD1/ZXt2JaPJND8TiGAITtM7jOAc6EVHCjpRrA71+tOu119T/0ewRDTTg1B+X7/MgiXtV7OaG0SuxULrzHv2oH0XWX750EKqdRN56uw2WKkyHQafKgPULIYcRKuj2NbUxh3jnbwA3yaPZ47I+nSRUuLLPr87eoaeJB0LYvK0DfDoe5jlwds8lp20jbY5SVYlPH+tqRo//hiYWbEUL5h3aFqOlphXp3eTnK1uUfWoII6IEudMfj7+ajn17CDd9THMNyIN7EdyZ7Lum9sIMjU1JGbT+xW1t6VVx0pGY2zmTt6XTVYrGmc/T/yD+aQZHKtaiRrvZiL5Izl5gkrvXgFmjgebMlLm6adplqK239PoyjgVjxBiZbKwsEq+YmNrCWImwoJ7d1j52Z0CqIcWF6DrXbT0nAFuIYayVjBSMvf2/dnan6NhYPxj+yfAUVUkhza5jtVW6woIgJlZ5Zi3rXmXDE= emergency@glt diff --git a/inventory/group_vars/lendwirbel-live/vars.yml b/inventory/group_vars/lendwirbel-live/vars.yml index 6c2e8389..a06be375 100644 --- a/inventory/group_vars/lendwirbel-live/vars.yml +++ b/inventory/group_vars/lendwirbel-live/vars.yml @@ -13,7 +13,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} docker_storage: type: lvm diff --git a/inventory/host_vars/ch-mimas2.yml b/inventory/host_vars/ch-mimas2.yml index 9d25770f..1cf22b81 100644 --- a/inventory/host_vars/ch-mimas2.yml +++ b/inventory/host_vars/ch-mimas2.yml @@ -5,7 +5,6 @@ install: token: "{{ vault_hcloud_api_token }}" server_name: "{{ host_name }}" -network: {} acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" diff --git a/inventory/host_vars/ch-testvm-hcloud.yml b/inventory/host_vars/ch-testvm-hcloud.yml index bd6d0ba8..ffd5117e 100644 --- a/inventory/host_vars/ch-testvm-hcloud.yml +++ b/inventory/host_vars/ch-testvm-hcloud.yml @@ -4,6 +4,5 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} apt_repo_provider: hetzner diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml index 862ced63..87d04db2 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -4,7 +4,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} docker_storage: type: lvm diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index 683fae49..c36d7eba 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -4,7 +4,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} docker_storage: type: lvm diff --git a/inventory/host_vars/ele-lt.yml b/inventory/host_vars/ele-lt.yml index e09026b7..adbaa1d8 100644 --- a/inventory/host_vars/ele-lt.yml +++ b/inventory/host_vars/ele-lt.yml @@ -4,8 +4,6 @@ install: credentials: token: "{{ vault_hcloud_api_token }}" -network: {} - sshd_allowusers_host: - "{{ liquidtruth_app_user }}" diff --git a/inventory/host_vars/sk-2019.yml b/inventory/host_vars/sk-2019.yml index 2d1cc8f1..f07cfdea 100644 --- a/inventory/host_vars/sk-2019.yml +++ b/inventory/host_vars/sk-2019.yml @@ -13,7 +13,6 @@ install: system_lvm: size: 20G -network: {} base_intel_nic_stability_fix: true ssh_users_root: diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index fa441514..ed6c0126 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -30,8 +30,6 @@ install: - nodev - noexec -network: {} - apt_repo_components: - main diff --git a/spreadspace/cloud-install.yml b/spreadspace/cloud-install.yml index 1a7b26c0..72db81d9 100644 --- a/spreadspace/cloud-install.yml +++ b/spreadspace/cloud-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/cloud-install.yml diff --git a/spreadspace/iso-generate.yml b/spreadspace/iso-generate.yml index 59a077ae..584b8914 100644 --- a/spreadspace/iso-generate.yml +++ b/spreadspace/iso-generate.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-generate.yml diff --git a/spreadspace/iso-install.yml b/spreadspace/iso-install.yml index 91dfca9e..5defe6d3 100644 --- a/spreadspace/iso-install.yml +++ b/spreadspace/iso-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/iso-install.yml diff --git a/spreadspace/usb-generate.yml b/spreadspace/usb-generate.yml index 12582abe..7f633f1e 100644 --- a/spreadspace/usb-generate.yml +++ b/spreadspace/usb-generate.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-generate.yml diff --git a/spreadspace/usb-install.yml b/spreadspace/usb-install.yml index ae948707..0f62bc85 100644 --- a/spreadspace/usb-install.yml +++ b/spreadspace/usb-install.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" - import_playbook: ../common/usb-install.yml diff --git a/spreadspace/vm-install.yml b/spreadspace/vm-install.yml index 7db00cba..da6a29a5 100644 --- a/spreadspace/vm-install.yml +++ b/spreadspace/vm-install.yml @@ -4,8 +4,8 @@ gather_facts: no tasks: - set_fact: - install: "{{ install }}" - network: "{{ network }}" - vm_host: "{{ vm_host }}" + install: "{{ install | default({}) }}" + network: "{{ network | default({}) }}" + vm_host: "{{ vm_host | default({}) }}" - import_playbook: ../common/vm-install.yml |