20 files changed, 20 insertions, 39 deletions

diff --git a/ansible/apt-dev.yml b/ansible/apt-dev.yml
index ae08369..0ca87a3 100644
--- a/ansible/apt-dev.yml
+++ b/ansible/apt-dev.yml
@@ -1,6 +1,5 @@
 - hosts: apt-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/billion.yml b/ansible/billion.yml
index 1357964..5e82447 100644
--- a/ansible/billion.yml
+++ b/ansible/billion.yml
@@ -1,6 +1,5 @@
 - hosts: billion
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - sane_debian_system
     - comfortable-debian-system
diff --git a/ansible/clab-dev.yml b/ansible/clab-dev.yml
index 7817e21..3a78c79 100644
--- a/ansible/clab-dev.yml
+++ b/ansible/clab-dev.yml
@@ -1,6 +1,5 @@
 - hosts: clab-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/ewww-dev.yml b/ansible/ewww-dev.yml
index f08a6a5..c7fe224 100644
--- a/ansible/ewww-dev.yml
+++ b/ansible/ewww-dev.yml
@@ -1,6 +1,5 @@
 - hosts: ewww-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/ewww-test.yml b/ansible/ewww-test.yml
index 9b826ac..e8a9f66 100644
--- a/ansible/ewww-test.yml
+++ b/ansible/ewww-test.yml
@@ -1,6 +1,5 @@
 - hosts: ewww-test
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
     - role: unix_users
diff --git a/ansible/icktool.yml b/ansible/icktool.yml
index f51eb7f..2dc9dab 100644
--- a/ansible/icktool.yml
+++ b/ansible/icktool.yml
@@ -1,6 +1,5 @@
 - hosts: icktool
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
     - role: unix_users
diff --git a/ansible/obnam-bench.yml b/ansible/obnam-bench.yml
index 0d7f948..92d2b5f 100644
--- a/ansible/obnam-bench.yml
+++ b/ansible/obnam-bench.yml
@@ -1,6 +1,5 @@
 - hosts: obnam-bench
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/obnam-dev.yml b/ansible/obnam-dev.yml
index d292365..595c865 100644
--- a/ansible/obnam-dev.yml
+++ b/ansible/obnam-dev.yml
@@ -1,6 +1,5 @@
 - hosts: obnam-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/openpgp-ca-dev.yml b/ansible/openpgp-ca-dev.yml
index 32f7bc8..9e41844 100644
--- a/ansible/openpgp-ca-dev.yml
+++ b/ansible/openpgp-ca-dev.yml
@@ -1,6 +1,5 @@
 - hosts: openpgp-ca-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/python-mess.yml b/ansible/python-mess.yml
index 80d216b..b9ca016 100644
--- a/ansible/python-mess.yml
+++ b/ansible/python-mess.yml
@@ -1,6 +1,5 @@
 - hosts: python-mess
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/roadmap-dev.yml b/ansible/roadmap-dev.yml
index f2e5b02..af7d4e8 100644
--- a/ansible/roadmap-dev.yml
+++ b/ansible/roadmap-dev.yml
@@ -1,6 +1,5 @@
 - hosts: roadmap-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/rust-dev.yml b/ansible/rust-dev.yml
index 7ea3993..76146da 100644
--- a/ansible/rust-dev.yml
+++ b/ansible/rust-dev.yml
@@ -1,6 +1,5 @@
 - hosts: rust-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/sequoia-dev.yml b/ansible/sequoia-dev.yml
index ea38646..c769b75 100644
--- a/ansible/sequoia-dev.yml
+++ b/ansible/sequoia-dev.yml
@@ -1,6 +1,5 @@
 - hosts: sequoia-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/sequoia-web.yml b/ansible/sequoia-web.yml
index eb730e0..f513b5a 100644
--- a/ansible/sequoia-web.yml
+++ b/ansible/sequoia-web.yml
@@ -1,6 +1,5 @@
 - hosts: sequoia-web
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
     - role: unix_users
diff --git a/ansible/sshca-dev.yml b/ansible/sshca-dev.yml
index c6843b0..87c07ba 100644
--- a/ansible/sshca-dev.yml
+++ b/ansible/sshca-dev.yml
@@ -1,6 +1,5 @@
 - hosts: sshca-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/subplot-dev.yml b/ansible/subplot-dev.yml
index 643429f..4052b35 100644
--- a/ansible/subplot-dev.yml
+++ b/ansible/subplot-dev.yml
@@ -1,6 +1,5 @@
 - hosts: subplot-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/vmadm-dev.yml b/ansible/vmadm-dev.yml
index 5daf97c..b253532 100644
--- a/ansible/vmadm-dev.yml
+++ b/ansible/vmadm-dev.yml
@@ -1,6 +1,5 @@
 - hosts: vmadm-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/vmdb2-dev.yml b/ansible/vmdb2-dev.yml
index 633a6b5..8746f16 100644
--- a/ansible/vmdb2-dev.yml
+++ b/ansible/vmdb2-dev.yml
@@ -1,6 +1,5 @@
 - hosts: vmdb2-dev
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
       tags: [sane]
diff --git a/ansible/web.yml b/ansible/web.yml
index ad17168..88881e4 100644
--- a/ansible/web.yml
+++ b/ansible/web.yml
@@ -1,6 +1,5 @@
 - hosts: web
-  remote_user: debian
-  become: yes
+  remote_user: root
   roles:
     - role: sane_debian_system
     - role: unix_users
diff --git a/vmadm/exolobe1/icktool.yaml b/vmadm/exolobe1/icktool.yaml
index 4bc9376..f2e468f 100644
--- a/vmadm/exolobe1/icktool.yaml
+++ b/vmadm/exolobe1/icktool.yaml
@@ -1,5 +1,5 @@
 icktool:
-  base: ~/tmp/debian-10-openstack-amd64.qcow2
+  base: ~/tmp/base-images/debian-10-openstack-amd64.qcow2
   cpus: 1
   memory_mib: 1024
   image_size_gib: 4