diff options
-rw-r--r-- | group_vars/all/vars.yml (renamed from group_vars/all/vars.yaml) | 0 | ||||
-rw-r--r-- | group_vars/elevate/vars.yml (renamed from group_vars/elevate/vars.yaml) | 0 | ||||
-rw-r--r-- | group_vars/hetzner/vars.yml (renamed from group_vars/hetzner/vars.yaml) | 0 | ||||
-rw-r--r-- | group_vars/k8s-emc/vars.yml | 2 | ||||
-rw-r--r-- | group_vars/skillz/vars.yml (renamed from group_vars/skillz/vars.yaml) | 0 | ||||
-rw-r--r-- | group_vars/spreadspace/vars.yml (renamed from group_vars/spreadspace/vars.yaml) | 0 | ||||
-rw-r--r-- | group_vars/spreadspace/vault.yml (renamed from group_vars/spreadspace/vault.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/calypso.yml (renamed from host_playbooks/calypso.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/dione.yml (renamed from host_playbooks/dione.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/elesearch.yml (renamed from host_playbooks/elesearch.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/emc-master.yml (renamed from host_playbooks/emc-master.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/emc-stats.yml (renamed from host_playbooks/emc-stats.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/emc-test.yml (renamed from host_playbooks/emc-test.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/emc-xx.yml (renamed from host_playbooks/emc-xx.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/helene.yml (renamed from host_playbooks/helene.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/sk2013.yml (renamed from host_playbooks/sk2013.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/sk2016.yml (renamed from host_playbooks/sk2016.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/telesto.yml (renamed from host_playbooks/telesto.yaml) | 0 | ||||
-rw-r--r-- | host_playbooks/thetys.yml (renamed from host_playbooks/thetys.yaml) | 0 | ||||
-rw-r--r-- | host_vars/calypso.yml (renamed from host_vars/calypso.yaml) | 0 | ||||
-rw-r--r-- | host_vars/dione.yml (renamed from host_vars/dione.yaml) | 0 | ||||
-rw-r--r-- | host_vars/elesearch.yml (renamed from host_vars/elesearch.yaml) | 0 | ||||
-rw-r--r-- | host_vars/emc-master.yml (renamed from host_vars/emc-master.yaml) | 0 | ||||
-rw-r--r-- | host_vars/emc-stats.yml (renamed from host_vars/emc-stats.yaml) | 0 | ||||
-rw-r--r-- | host_vars/helene.yml (renamed from host_vars/helene.yaml) | 0 | ||||
-rw-r--r-- | host_vars/sk2013.yml (renamed from host_vars/sk2013.yaml) | 0 | ||||
-rw-r--r-- | host_vars/sk2016.yml (renamed from host_vars/sk2016.yaml) | 0 | ||||
-rw-r--r-- | host_vars/telesto.yml (renamed from host_vars/telesto.yaml) | 0 | ||||
-rw-r--r-- | host_vars/thetys.yml (renamed from host_vars/thetys.yaml) | 0 | ||||
-rw-r--r-- | playbooks/k8s-emc.yml (renamed from playbooks/k8s-emc.yaml) | 0 | ||||
-rw-r--r-- | roles/admin-user/tasks/main.yml (renamed from roles/admin-user/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/base/defaults/main.yml (renamed from roles/base/defaults/main.yaml) | 0 | ||||
-rw-r--r-- | roles/base/tasks/main.yml (renamed from roles/base/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/base/vars/main.yml (renamed from roles/base/vars/main.yaml) | 0 | ||||
-rw-r--r-- | roles/blackmagic-desktopvideo/handlers/main.yml (renamed from roles/blackmagic-desktopvideo/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/blackmagic-desktopvideo/tasks/main.yml (renamed from roles/blackmagic-desktopvideo/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/docker/tasks/main.yml (renamed from roles/docker/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/emc-stats/tasks/main.yml (renamed from roles/emc-stats/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/hetzner-slim/tasks/main.yml (renamed from roles/hetzner-slim/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/kubernetes-base/tasks/main.yml (renamed from roles/kubernetes-base/tasks/main.yaml) | 1 | ||||
-rw-r--r-- | roles/kubernetes-net/handlers/main.yml (renamed from roles/kubernetes-net/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/kubernetes-net/tasks/add.yml (renamed from roles/kubernetes-net/tasks/add.yaml) | 0 | ||||
-rw-r--r-- | roles/kubernetes-net/tasks/main.yml (renamed from roles/kubernetes-net/tasks/main.yaml) | 4 | ||||
-rw-r--r-- | roles/kubernetes-net/tasks/remove.yml (renamed from roles/kubernetes-net/tasks/remove.yaml) | 0 | ||||
-rw-r--r-- | roles/reboot-and-wait/tasks/main.yml (renamed from roles/reboot-and-wait/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/scaleway-slim/tasks/main.yml (renamed from roles/scaleway-slim/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/spreadspace-apt-repo/tasks/main.yml (renamed from roles/spreadspace-apt-repo/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/sshserver/handlers/main.yml (renamed from roles/sshserver/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/sshserver/tasks/main.yml (renamed from roles/sshserver/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/ubuntu-ws/defaults/main.yml (renamed from roles/ubuntu-ws/defaults/main.yaml) | 0 | ||||
-rw-r--r-- | roles/ubuntu-ws/tasks/fs.yml (renamed from roles/ubuntu-ws/tasks/fs.yaml) | 0 | ||||
-rw-r--r-- | roles/ubuntu-ws/tasks/main.yml (renamed from roles/ubuntu-ws/tasks/main.yaml) | 2 | ||||
-rw-r--r-- | roles/upgrade/tasks/main.yml (renamed from roles/upgrade/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-grub/handlers/main.yml (renamed from roles/vm-grub/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-grub/tasks/main.yml (renamed from roles/vm-grub/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-host/defaults/main.yml (renamed from roles/vm-host/defaults/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-host/handlers/main.yml (renamed from roles/vm-host/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-host/tasks/main.yml (renamed from roles/vm-host/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-install/tasks/main.yml (renamed from roles/vm-install/tasks/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-network/handlers/main.yml (renamed from roles/vm-network/handlers/main.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-network/tasks/lan.yml (renamed from roles/vm-network/tasks/lan.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-network/tasks/main.yml (renamed from roles/vm-network/tasks/main.yaml) | 6 | ||||
-rw-r--r-- | roles/vm-network/tasks/public.yml (renamed from roles/vm-network/tasks/public.yaml) | 0 | ||||
-rw-r--r-- | roles/vm-network/tasks/systemd-link.yml (renamed from roles/vm-network/tasks/systemd-link.yaml) | 0 | ||||
-rw-r--r-- | roles/zsh/tasks/main.yml (renamed from roles/zsh/tasks/main.yaml) | 0 | ||||
-rwxr-xr-x | vm-install.sh | 2 | ||||
-rw-r--r-- | vminstall.yml (renamed from vminstall.yaml) | 2 |
67 files changed, 10 insertions, 9 deletions
diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yml index 65417f03..65417f03 100644 --- a/group_vars/all/vars.yaml +++ b/group_vars/all/vars.yml diff --git a/group_vars/elevate/vars.yaml b/group_vars/elevate/vars.yml index 1808db88..1808db88 100644 --- a/group_vars/elevate/vars.yaml +++ b/group_vars/elevate/vars.yml diff --git a/group_vars/hetzner/vars.yaml b/group_vars/hetzner/vars.yml index 2e5c8b4a..2e5c8b4a 100644 --- a/group_vars/hetzner/vars.yaml +++ b/group_vars/hetzner/vars.yml diff --git a/group_vars/k8s-emc/vars.yml b/group_vars/k8s-emc/vars.yml index 20716d3e..6b1344ae 100644 --- a/group_vars/k8s-emc/vars.yml +++ b/group_vars/k8s-emc/vars.yml @@ -2,7 +2,7 @@ docker_pkg_version: 17.03.2~ce-0~debian-stretch kubernetes: - pkg_version: 1.9.2-00 + pkg_version: 1.9.6-00 dedicated_master: True api_advertise_ip: 144.76.160.141 diff --git a/group_vars/skillz/vars.yaml b/group_vars/skillz/vars.yml index 4d8f679d..4d8f679d 100644 --- a/group_vars/skillz/vars.yaml +++ b/group_vars/skillz/vars.yml diff --git a/group_vars/spreadspace/vars.yaml b/group_vars/spreadspace/vars.yml index 30011725..30011725 100644 --- a/group_vars/spreadspace/vars.yaml +++ b/group_vars/spreadspace/vars.yml diff --git a/group_vars/spreadspace/vault.yaml b/group_vars/spreadspace/vault.yml index 625cf08f..625cf08f 100644 --- a/group_vars/spreadspace/vault.yaml +++ b/group_vars/spreadspace/vault.yml diff --git a/host_playbooks/calypso.yaml b/host_playbooks/calypso.yml index cd6a9ac0..cd6a9ac0 100644 --- a/host_playbooks/calypso.yaml +++ b/host_playbooks/calypso.yml diff --git a/host_playbooks/dione.yaml b/host_playbooks/dione.yml index 70b6a077..70b6a077 100644 --- a/host_playbooks/dione.yaml +++ b/host_playbooks/dione.yml diff --git a/host_playbooks/elesearch.yaml b/host_playbooks/elesearch.yml index 7640977e..7640977e 100644 --- a/host_playbooks/elesearch.yaml +++ b/host_playbooks/elesearch.yml diff --git a/host_playbooks/emc-master.yaml b/host_playbooks/emc-master.yml index 9d541517..9d541517 100644 --- a/host_playbooks/emc-master.yaml +++ b/host_playbooks/emc-master.yml diff --git a/host_playbooks/emc-stats.yaml b/host_playbooks/emc-stats.yml index 1ab4e47b..1ab4e47b 100644 --- a/host_playbooks/emc-stats.yaml +++ b/host_playbooks/emc-stats.yml diff --git a/host_playbooks/emc-test.yaml b/host_playbooks/emc-test.yml index 2a298e8b..2a298e8b 100644 --- a/host_playbooks/emc-test.yaml +++ b/host_playbooks/emc-test.yml diff --git a/host_playbooks/emc-xx.yaml b/host_playbooks/emc-xx.yml index e2005178..e2005178 100644 --- a/host_playbooks/emc-xx.yaml +++ b/host_playbooks/emc-xx.yml diff --git a/host_playbooks/helene.yaml b/host_playbooks/helene.yml index ce45cddf..ce45cddf 100644 --- a/host_playbooks/helene.yaml +++ b/host_playbooks/helene.yml diff --git a/host_playbooks/sk2013.yaml b/host_playbooks/sk2013.yml index 387f1af1..387f1af1 100644 --- a/host_playbooks/sk2013.yaml +++ b/host_playbooks/sk2013.yml diff --git a/host_playbooks/sk2016.yaml b/host_playbooks/sk2016.yml index 33de823d..33de823d 100644 --- a/host_playbooks/sk2016.yaml +++ b/host_playbooks/sk2016.yml diff --git a/host_playbooks/telesto.yaml b/host_playbooks/telesto.yml index 11b45596..11b45596 100644 --- a/host_playbooks/telesto.yaml +++ b/host_playbooks/telesto.yml diff --git a/host_playbooks/thetys.yaml b/host_playbooks/thetys.yml index fffeb769..fffeb769 100644 --- a/host_playbooks/thetys.yaml +++ b/host_playbooks/thetys.yml diff --git a/host_vars/calypso.yaml b/host_vars/calypso.yml index ff853586..ff853586 100644 --- a/host_vars/calypso.yaml +++ b/host_vars/calypso.yml diff --git a/host_vars/dione.yaml b/host_vars/dione.yml index 75b289c2..75b289c2 100644 --- a/host_vars/dione.yaml +++ b/host_vars/dione.yml diff --git a/host_vars/elesearch.yaml b/host_vars/elesearch.yml index 296f562e..296f562e 100644 --- a/host_vars/elesearch.yaml +++ b/host_vars/elesearch.yml diff --git a/host_vars/emc-master.yaml b/host_vars/emc-master.yml index 5b9f52b9..5b9f52b9 100644 --- a/host_vars/emc-master.yaml +++ b/host_vars/emc-master.yml diff --git a/host_vars/emc-stats.yaml b/host_vars/emc-stats.yml index 64917b8e..64917b8e 100644 --- a/host_vars/emc-stats.yaml +++ b/host_vars/emc-stats.yml diff --git a/host_vars/helene.yaml b/host_vars/helene.yml index b40fb069..b40fb069 100644 --- a/host_vars/helene.yaml +++ b/host_vars/helene.yml diff --git a/host_vars/sk2013.yaml b/host_vars/sk2013.yml index d1427a67..d1427a67 100644 --- a/host_vars/sk2013.yaml +++ b/host_vars/sk2013.yml diff --git a/host_vars/sk2016.yaml b/host_vars/sk2016.yml index 872223db..872223db 100644 --- a/host_vars/sk2016.yaml +++ b/host_vars/sk2016.yml diff --git a/host_vars/telesto.yaml b/host_vars/telesto.yml index ff853586..ff853586 100644 --- a/host_vars/telesto.yaml +++ b/host_vars/telesto.yml diff --git a/host_vars/thetys.yaml b/host_vars/thetys.yml index ff853586..ff853586 100644 --- a/host_vars/thetys.yaml +++ b/host_vars/thetys.yml diff --git a/playbooks/k8s-emc.yaml b/playbooks/k8s-emc.yml index b47ed5fc..b47ed5fc 100644 --- a/playbooks/k8s-emc.yaml +++ b/playbooks/k8s-emc.yml diff --git a/roles/admin-user/tasks/main.yaml b/roles/admin-user/tasks/main.yml index e6fc3572..e6fc3572 100644 --- a/roles/admin-user/tasks/main.yaml +++ b/roles/admin-user/tasks/main.yml diff --git a/roles/base/defaults/main.yaml b/roles/base/defaults/main.yml index f94f3ac4..f94f3ac4 100644 --- a/roles/base/defaults/main.yaml +++ b/roles/base/defaults/main.yml diff --git a/roles/base/tasks/main.yaml b/roles/base/tasks/main.yml index 3c6fc790..3c6fc790 100644 --- a/roles/base/tasks/main.yaml +++ b/roles/base/tasks/main.yml diff --git a/roles/base/vars/main.yaml b/roles/base/vars/main.yml index 557a4a7c..557a4a7c 100644 --- a/roles/base/vars/main.yaml +++ b/roles/base/vars/main.yml diff --git a/roles/blackmagic-desktopvideo/handlers/main.yaml b/roles/blackmagic-desktopvideo/handlers/main.yml index bb7fde2b..bb7fde2b 100644 --- a/roles/blackmagic-desktopvideo/handlers/main.yaml +++ b/roles/blackmagic-desktopvideo/handlers/main.yml diff --git a/roles/blackmagic-desktopvideo/tasks/main.yaml b/roles/blackmagic-desktopvideo/tasks/main.yml index 632f36ea..632f36ea 100644 --- a/roles/blackmagic-desktopvideo/tasks/main.yaml +++ b/roles/blackmagic-desktopvideo/tasks/main.yml diff --git a/roles/docker/tasks/main.yaml b/roles/docker/tasks/main.yml index 2253f1ed..2253f1ed 100644 --- a/roles/docker/tasks/main.yaml +++ b/roles/docker/tasks/main.yml diff --git a/roles/emc-stats/tasks/main.yaml b/roles/emc-stats/tasks/main.yml index 69c7af01..69c7af01 100644 --- a/roles/emc-stats/tasks/main.yaml +++ b/roles/emc-stats/tasks/main.yml diff --git a/roles/hetzner-slim/tasks/main.yaml b/roles/hetzner-slim/tasks/main.yml index 81218085..81218085 100644 --- a/roles/hetzner-slim/tasks/main.yaml +++ b/roles/hetzner-slim/tasks/main.yml diff --git a/roles/kubernetes-base/tasks/main.yaml b/roles/kubernetes-base/tasks/main.yml index 4e3aba4e..cc3bc83a 100644 --- a/roles/kubernetes-base/tasks/main.yaml +++ b/roles/kubernetes-base/tasks/main.yml @@ -25,6 +25,7 @@ apt: name: apt-transport-https state: present + force: yes - name: add kubernetes apt key apt_key: diff --git a/roles/kubernetes-net/handlers/main.yaml b/roles/kubernetes-net/handlers/main.yml index bb7fde2b..bb7fde2b 100644 --- a/roles/kubernetes-net/handlers/main.yaml +++ b/roles/kubernetes-net/handlers/main.yml diff --git a/roles/kubernetes-net/tasks/add.yaml b/roles/kubernetes-net/tasks/add.yml index f4e422c6..f4e422c6 100644 --- a/roles/kubernetes-net/tasks/add.yaml +++ b/roles/kubernetes-net/tasks/add.yml diff --git a/roles/kubernetes-net/tasks/main.yaml b/roles/kubernetes-net/tasks/main.yml index c8d06380..8c94292e 100644 --- a/roles/kubernetes-net/tasks/main.yaml +++ b/roles/kubernetes-net/tasks/main.yml @@ -1,8 +1,8 @@ --- - name: add node to overlay network - include_tasks: add.yaml + include_tasks: add.yml when: k8s_remove_node is not defined - name: remove node from overlay network - include_tasks: remove.yaml + include_tasks: remove.yml when: k8s_remove_node is defined diff --git a/roles/kubernetes-net/tasks/remove.yaml b/roles/kubernetes-net/tasks/remove.yml index 6695bd5d..6695bd5d 100644 --- a/roles/kubernetes-net/tasks/remove.yaml +++ b/roles/kubernetes-net/tasks/remove.yml diff --git a/roles/reboot-and-wait/tasks/main.yaml b/roles/reboot-and-wait/tasks/main.yml index 4c1b7097..4c1b7097 100644 --- a/roles/reboot-and-wait/tasks/main.yaml +++ b/roles/reboot-and-wait/tasks/main.yml diff --git a/roles/scaleway-slim/tasks/main.yaml b/roles/scaleway-slim/tasks/main.yml index 81218085..81218085 100644 --- a/roles/scaleway-slim/tasks/main.yaml +++ b/roles/scaleway-slim/tasks/main.yml diff --git a/roles/spreadspace-apt-repo/tasks/main.yaml b/roles/spreadspace-apt-repo/tasks/main.yml index 9434ae4d..9434ae4d 100644 --- a/roles/spreadspace-apt-repo/tasks/main.yaml +++ b/roles/spreadspace-apt-repo/tasks/main.yml diff --git a/roles/sshserver/handlers/main.yaml b/roles/sshserver/handlers/main.yml index 822887e3..822887e3 100644 --- a/roles/sshserver/handlers/main.yaml +++ b/roles/sshserver/handlers/main.yml diff --git a/roles/sshserver/tasks/main.yaml b/roles/sshserver/tasks/main.yml index 6d6cc59c..6d6cc59c 100644 --- a/roles/sshserver/tasks/main.yaml +++ b/roles/sshserver/tasks/main.yml diff --git a/roles/ubuntu-ws/defaults/main.yaml b/roles/ubuntu-ws/defaults/main.yml index a4f8e2a2..a4f8e2a2 100644 --- a/roles/ubuntu-ws/defaults/main.yaml +++ b/roles/ubuntu-ws/defaults/main.yml diff --git a/roles/ubuntu-ws/tasks/fs.yaml b/roles/ubuntu-ws/tasks/fs.yml index 07358b99..07358b99 100644 --- a/roles/ubuntu-ws/tasks/fs.yaml +++ b/roles/ubuntu-ws/tasks/fs.yml diff --git a/roles/ubuntu-ws/tasks/main.yaml b/roles/ubuntu-ws/tasks/main.yml index 386da07d..7dd682c1 100644 --- a/roles/ubuntu-ws/tasks/main.yaml +++ b/roles/ubuntu-ws/tasks/main.yml @@ -1,5 +1,5 @@ --- -- import_tasks: fs.yaml +- import_tasks: fs.yml - name: prohibited packages template: diff --git a/roles/upgrade/tasks/main.yaml b/roles/upgrade/tasks/main.yml index df7360de..df7360de 100644 --- a/roles/upgrade/tasks/main.yaml +++ b/roles/upgrade/tasks/main.yml diff --git a/roles/vm-grub/handlers/main.yaml b/roles/vm-grub/handlers/main.yml index 4bddbb14..4bddbb14 100644 --- a/roles/vm-grub/handlers/main.yaml +++ b/roles/vm-grub/handlers/main.yml diff --git a/roles/vm-grub/tasks/main.yaml b/roles/vm-grub/tasks/main.yml index bd48a470..bd48a470 100644 --- a/roles/vm-grub/tasks/main.yaml +++ b/roles/vm-grub/tasks/main.yml diff --git a/roles/vm-host/defaults/main.yaml b/roles/vm-host/defaults/main.yml index 0e3cddf1..0e3cddf1 100644 --- a/roles/vm-host/defaults/main.yaml +++ b/roles/vm-host/defaults/main.yml diff --git a/roles/vm-host/handlers/main.yaml b/roles/vm-host/handlers/main.yml index 158f4dcd..158f4dcd 100644 --- a/roles/vm-host/handlers/main.yaml +++ b/roles/vm-host/handlers/main.yml diff --git a/roles/vm-host/tasks/main.yaml b/roles/vm-host/tasks/main.yml index a5e98fa9..a5e98fa9 100644 --- a/roles/vm-host/tasks/main.yaml +++ b/roles/vm-host/tasks/main.yml diff --git a/roles/vm-install/tasks/main.yaml b/roles/vm-install/tasks/main.yml index 22a6a351..22a6a351 100644 --- a/roles/vm-install/tasks/main.yaml +++ b/roles/vm-install/tasks/main.yml diff --git a/roles/vm-network/handlers/main.yaml b/roles/vm-network/handlers/main.yml index f967fa86..f967fa86 100644 --- a/roles/vm-network/handlers/main.yaml +++ b/roles/vm-network/handlers/main.yml diff --git a/roles/vm-network/tasks/lan.yaml b/roles/vm-network/tasks/lan.yml index ec436e9b..ec436e9b 100644 --- a/roles/vm-network/tasks/lan.yaml +++ b/roles/vm-network/tasks/lan.yml diff --git a/roles/vm-network/tasks/main.yaml b/roles/vm-network/tasks/main.yml index 1052f134..222a350b 100644 --- a/roles/vm-network/tasks/main.yaml +++ b/roles/vm-network/tasks/main.yml @@ -1,9 +1,9 @@ --- -- import_tasks: systemd-link.yaml +- import_tasks: systemd-link.yml when: srv_network.systemd_link is defined -- import_tasks: public.yaml +- import_tasks: public.yml when: srv_network.public is defined -- import_tasks: lan.yaml +- import_tasks: lan.yml when: srv_network.public is not defined diff --git a/roles/vm-network/tasks/public.yaml b/roles/vm-network/tasks/public.yml index 8b0e317a..8b0e317a 100644 --- a/roles/vm-network/tasks/public.yaml +++ b/roles/vm-network/tasks/public.yml diff --git a/roles/vm-network/tasks/systemd-link.yaml b/roles/vm-network/tasks/systemd-link.yml index ad12cd37..ad12cd37 100644 --- a/roles/vm-network/tasks/systemd-link.yaml +++ b/roles/vm-network/tasks/systemd-link.yml diff --git a/roles/zsh/tasks/main.yaml b/roles/zsh/tasks/main.yml index 12eac8c4..12eac8c4 100644 --- a/roles/zsh/tasks/main.yaml +++ b/roles/zsh/tasks/main.yml diff --git a/vm-install.sh b/vm-install.sh index 199963fd..bccb076b 100755 --- a/vm-install.sh +++ b/vm-install.sh @@ -13,4 +13,4 @@ echo "########## clearing old ssh host keys #########" echo "" echo "######## running the install playbook ########" -exec ansible-playbook -e "vmname=$1" -e "vmdistro=$2" -e "vmdistcodename=$3" vminstall.yaml +exec ansible-playbook -e "vmname=$1" -e "vmdistro=$2" -e "vmdistcodename=$3" vminstall.yml diff --git a/vminstall.yaml b/vminstall.yml index 43fcf81b..e82aa33c 100644 --- a/vminstall.yaml +++ b/vminstall.yml @@ -10,7 +10,7 @@ roles: - role: vm-install -- import_playbook: "host_playbooks/{{ vmname }}.yaml" +- import_playbook: "host_playbooks/{{ vmname }}.yml" - name: Reboot and wait for VM come back hosts: "{{ vmname }}" |