vmadm-dev: fix libvirt default network

Setting up the default network stopped working. Now it works, but only
after the host is rebooted. I'm too tired to figure out what broken,
this'll do.

Sponsored-by: author

3 files changed, 2 insertions, 71 deletions

diff --git a/ansible/stamina-vms.sh b/ansible/stamina-vms.sh
index 4005240..3ca7513 100755
--- a/ansible/stamina-vms.sh
+++ b/ansible/stamina-vms.sh
@@ -6,7 +6,6 @@ playbooks="
 ambient-dev.yml
 debian-ansible-dev.yml
 icktool.yml
-radicle-dev.yml
 subplot-dev.yml
 vmadm-dev.yml
 v-i-dev.yml
diff --git a/ansible/vmadm-dev.yml b/ansible/vmadm-dev.yml
index af5c633..4d37461 100644
--- a/ansible/vmadm-dev.yml
+++ b/ansible/vmadm-dev.yml
@@ -43,12 +43,10 @@
         group: liw
         mode: 0644
     - virt_net:
+        xml: /usr/share/libvirt/networks/default.xml
         name: default
+        command: define
         autostart: yes
-    - virt_net:
-        name: default
-        command: start
-        state: active
     - user:
         name: liw
         groups:
diff --git a/ansible/vmdb2-dev-sid.yml b/ansible/vmdb2-dev-sid.yml
deleted file mode 100644
index 6a65702..0000000
--- a/ansible/vmdb2-dev-sid.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-- hosts: vmdb2-dev-sid
-  remote_user: debian
-  become: yes
-  roles:
-    - role: sane_debian_system
-      tags: [sane]
-    - role: sshd
-      tags: [sshd]
-    - role: comfortable-debian-system
-      tags: [comfy]
-    - role: unix_users
-      tags: [users]
-    - role: version-controller
-      tags: [vcs]
-    - role: liw
-      tags: [liw]
-  tasks:
-    - apt:
-        name:
-          - ansible
-          - build-essential
-          - cmdtest
-          - cryptsetup
-          - debhelper
-          - debian-ports-archive-keyring
-          - debootstrap
-          - dosfstools
-          - expect
-          - kpartx
-          - lvm2
-          - moreutils
-          - pandoc
-          - parted
-          - python3-all
-          - python3-cliapp
-          - python3-coverage-test-runner
-          - python3-jinja2
-          - python3-yaml
-          - qemu-system-arm
-          - qemu-system-ppc
-          - qemu-system-x86
-          - qemu-user-static
-          - qemu-utils
-          - vmdb2
-          - zerofree
-  vars:
-    ansible_python_interpreter: python3
-
-    sane_debian_system_version: 2
-    sane_debian_system_hostname: vmdb2-dev-sid
-    sane_debian_system_codename: unstable
-
-    timezone: Europe/Helsinki
-
-    unix_users_version: 2
-    unix_users:
-      - username: liw
-        comment: Lars Wirzenius
-        sudo: yes
-
-    sane_debian_system_sources_lists:
-      - repo: deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main
-        signing_key: "{{ ci_prod_signing_key }}"
-
-    sshd_version: 1
-    sshd_allow_authorized_keys: yes