From d051245ed058293546c3fe2247e59a17c839b1c0 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 4 Oct 2020 17:41:55 +0300 Subject: drop manager vmdb and non-basic worker vmdb etc --- vm.vmdb | 50 ------------------------ vm.yml | 79 ------------------------------------- worker-scap.vmdb | 49 ----------------------- worker-scap.yml | 110 ---------------------------------------------------- worker-subplot.vmdb | 49 ----------------------- worker-subplot.yml | 54 -------------------------- worker-vmdb2.vmdb | 49 ----------------------- worker-vmdb2.yml | 95 --------------------------------------------- 8 files changed, 535 deletions(-) delete mode 100644 vm.vmdb delete mode 100644 vm.yml delete mode 100644 worker-scap.vmdb delete mode 100644 worker-scap.yml delete mode 100644 worker-subplot.vmdb delete mode 100644 worker-subplot.yml delete mode 100644 worker-vmdb2.vmdb delete mode 100644 worker-vmdb2.yml diff --git a/vm.vmdb b/vm.vmdb deleted file mode 100644 index 45def5e..0000000 --- a/vm.vmdb +++ /dev/null @@ -1,50 +0,0 @@ -# An image for running the Ick contractor outer VM. - -steps: - - mkimg: "{{ output }}" - size: 20G - - - mklabel: msdos - device: "{{ output }}" - - - mkpart: primary - device: "{{ output }}" - start: 0% - end: 100% - tag: / - - - kpartx: "{{ output }}" - - - mkfs: ext4 - partition: / - - - mount: / - - - unpack-rootfs: / - - - debootstrap: buster - mirror: http://deb.debian.org/debian - target: / - unless: rootfs_unpacked - - - apt: install - packages: - - linux-image-amd64 - - locales-all - - python3 - - sudo - - ssh - - ansible - tag: / - unless: rootfs_unpacked - - - cache-rootfs: / - unless: rootfs_unpacked - - - fstab: / - - - ansible: / - playbook: vm.yml - - - grub: bios - tag: / diff --git a/vm.yml b/vm.yml deleted file mode 100644 index 783685b..0000000 --- a/vm.yml +++ /dev/null @@ -1,79 +0,0 @@ -- hosts: image - tasks: - - shell: | - echo "{{ host }}" > /etc/hostname - sed -i '/^127\.0\.0.*localhost.*/s/.*/127.0.0.1 localhost {{ host }}/' \ - /etc/hosts - sed -i '/^root:[^:]:/s//root::/' /etc/passwd - - copy: - content: | - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet dhcp - dest: /etc/network/interfaces - - copy: - content: | - options kvm-intel nested=1 - options kvm-intel enable_shadow_vmcs=1 - options kvm-intel enable_apicv=1 - options kvm-intel ept=1 - dest: /etc/modprobe.d/kvm-nested.conf - - apt: - name: - - ssh - - sudo - - qemu-system-x86 - - virtinst - - libvirt-daemon-system - - libvirt-clients - - locales-all - - jq - - rsync - - kpartx - - name: "modify libvirt to use a non-standard IP range for guests" - shell: - sed -i 's/192\.168\.122\./192.168.99\./g' /etc/libvirt/qemu/networks/default.xml - - user: - comment: "Manager" - name: manager - shell: /bin/bash - groups: - - libvirt - - authorized_key: - user: manager - key: "{{ user_pub }}" - - copy: - content: | - manager ALL=(ALL:ALL) NOPASSWD: ALL - dest: /etc/sudoers.d/manager - owner: root - group: root - mode: 0600 - - file: - state: directory - path: /home/manager/.ssh - owner: manager - group: manager - mode: 0700 - - copy: - src: "{{ item }}" - dest: "/home/manager/.ssh/{{ item }}" - owner: manager - group: manager - mode: 0600 - with_items: - - manager.key - - manager.key.pub - - copy: - src: manager-ssh-config - dest: /home/manager/.ssh/config - owner: manager - group: manager - mode: 0600 - vars: - host: contractor - ansible_python_interpreter: /usr/bin/python3 - user_pub: | - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDAlECa3tbFGXhB3Zh/4/GhM11THOThVfiuLqqJ2dpWHEClzpKJHpzzwWt7g9z/MMQNMsUJLy+okz+De6hdjjmYJ9kG9Sr3H4YKq6itGQMj7L/cH3WS3ynp0uy0oW3hf932vDZKQ8iy9vczXH+ERYl+4TYae1Jp4Hyf4/2IYxEfuhKctvSvqySST3Qk9JNZ71HFGOWhjH/MmoCLoT1v+HkqmHdYf/GMKGRo3gqCEGgCgNErYYIyKm3OF3dHXK+hyGLE/cZNu6fU5woW3rvtUCFt08Ri2pm0cnXXJn9jQIMxfS5Kkf64svwgzKmPqgX1f4flopYPlsBXduCgzbJvj+lpgauAk/i1A5B01CFa9sI4C6pHZmwk1qxRwN+4IXL2CQt+tDgYC84ZDDd8R7cNyL22a3KhMQmdHtvog1beAa3Ab+J+cafkXXN+Es9f1wQjzk7DiHupmJIVofBvPP+cRcB46rwha6ati8Fa5QkT9rXFNqQsKk7jq8TIi54Bm15OOa0jInGG3TM17b9Ftu2WTJSAaqgBnDfZiInK7HEvC6K/IBljrN3oGagmFZPrAvzw7d6C2/nKFAQtfoMcE5oWVDrJyjsmJ8oaru0E8rwj7mMvyKPgEMnXTGXLWDgEo50+i291m4bkCxVwiOPbPRvdMll1Y8qfBAPT76sY4Ikgcw/2iw== openpgp:0xBBE80E50 diff --git a/worker-scap.vmdb b/worker-scap.vmdb deleted file mode 100644 index a0b7a68..0000000 --- a/worker-scap.vmdb +++ /dev/null @@ -1,49 +0,0 @@ -steps: - - mkimg: "{{ output }}" - size: 4G - - - mklabel: msdos - device: "{{ output }}" - - - mkpart: primary - device: "{{ output }}" - start: 0% - end: 100% - tag: / - - - kpartx: "{{ output }}" - - - mkfs: ext4 - partition: / - - - mount: / - - - virtual-filesystems: / - - - unpack-rootfs: / - - - debootstrap: buster - mirror: http://deb.debian.org/debian - target: / - unless: rootfs_unpacked - - - apt: install - packages: - - linux-image-amd64 - - locales-all - - openssh-server - - python3 - - sudo - tag: / - unless: rootfs_unpacked - - - cache-rootfs: / - unless: rootfs_unpacked - - - fstab: / - - - ansible: / - playbook: worker-scap.yml - - - grub: bios - tag: / diff --git a/worker-scap.yml b/worker-scap.yml deleted file mode 100644 index 1003b77..0000000 --- a/worker-scap.yml +++ /dev/null @@ -1,110 +0,0 @@ -- hosts: image - tasks: - - shell: | - echo "{{ host }}" > /etc/hostname - sed -i '/^127\.0\.0.*localhost.*/s/.*/127.0.0.1 localhost {{ host }}/' \ - /etc/hosts - sed -i '/^root:[^:]:/s//root::/' /etc/passwd - - copy: - content: | - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet dhcp - dest: /etc/network/interfaces - - copy: - content: "{{ ci_prod_signing_key }}" - dest: /etc/apt/trusted.gpg.d/ci_prod.asc - - apt_repository: - repo: "deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main" - - apt: - name: - - bash-completion - - build-essential - - ca-certificates - - debhelper - - dh-python - - flake8 - - git - - git-buildpackage - - libjpeg-dev - - locales-all - - openssh-server - - openssl - - pandoc - - php - - python-all-dev - - python-concurrent.futures - - python-configparser - - python-flake8 - - python-jinja2 - - python-openssl - - python-psutil - - python-pygments - - python-requests - - python-setuptools - - python-six - - python-yaml - - python3-all-dev - - rsync - - subplot - - sudo - - tox - - zlib1g-dev - - user: - comment: "Worker" - name: worker - shell: /bin/bash - - file: - state: directory - path: /home/worker/.ssh - owner: worker - group: worker - mode: 0700 - - copy: - src: manager.key.pub - dest: /home/worker/.ssh/authorized_keys - owner: worker - group: worker - mode: 0600 - - copy: - content: | - worker ALL=(ALL:ALL) NOPASSWD: ALL - dest: /etc/sudoers.d/worker - owner: root - group: root - mode: 0600 - vars: - host: worker - ansible_python_interpreter: /usr/bin/python3 - ci_prod_signing_key: | - -----BEGIN PGP PUBLIC KEY BLOCK----- - - mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp - 5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS - +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO - HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p - JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM - jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM - 3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4 - 6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe - UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5 - TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl - kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB - tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3 - LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ - CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h - dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ - LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN - 31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw - P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv - 2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM - cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD - SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441 - 6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK - Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod - GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps - GSJSdir7NkZidgwoCPA7BTqsb5LN - =dXB0 - -----END PGP PUBLIC KEY BLOCK----- diff --git a/worker-subplot.vmdb b/worker-subplot.vmdb deleted file mode 100644 index 3ff1d1c..0000000 --- a/worker-subplot.vmdb +++ /dev/null @@ -1,49 +0,0 @@ -steps: - - mkimg: "{{ output }}" - size: 4G - - - mklabel: msdos - device: "{{ output }}" - - - mkpart: primary - device: "{{ output }}" - start: 0% - end: 100% - tag: / - - - kpartx: "{{ output }}" - - - mkfs: ext4 - partition: / - - - mount: / - - - virtual-filesystems: / - - - unpack-rootfs: / - - - debootstrap: buster - mirror: http://deb.debian.org/debian - target: / - unless: rootfs_unpacked - - - apt: install - packages: - - linux-image-amd64 - - locales-all - - openssh-server - - python3 - - sudo - tag: / - unless: rootfs_unpacked - - - cache-rootfs: / - unless: rootfs_unpacked - - - fstab: / - - - ansible: / - playbook: worker-subplot.yml - - - grub: bios - tag: / diff --git a/worker-subplot.yml b/worker-subplot.yml deleted file mode 100644 index 8cf09ec..0000000 --- a/worker-subplot.yml +++ /dev/null @@ -1,54 +0,0 @@ -- hosts: image - tasks: - - shell: | - echo "{{ host }}" > /etc/hostname - sed -i '/^127\.0\.0.*localhost.*/s/.*/127.0.0.1 localhost {{ host }}/' \ - /etc/hosts - sed -i '/^root:[^:]:/s//root::/' /etc/passwd - - copy: - content: | - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet dhcp - dest: /etc/network/interfaces - - apt: - name: - - build-essential - - cargo - - graphviz - - librsvg2-bin - - locales-all - - pandoc - - pandoc-citeproc - - plantuml - - texlive-fonts-recommended - - texlive-latex-base - - texlive-latex-recommended - - user: - comment: "Worker" - name: worker - shell: /bin/bash - - file: - state: directory - path: /home/worker/.ssh - owner: worker - group: worker - mode: 0700 - - copy: - src: manager.key.pub - dest: /home/worker/.ssh/authorized_keys - owner: worker - group: worker - mode: 0600 - - copy: - content: | - worker ALL=(ALL:ALL) NOPASSWD: ALL - dest: /etc/sudoers.d/worker - owner: root - group: root - mode: 0600 - vars: - host: worker - ansible_python_interpreter: /usr/bin/python3 diff --git a/worker-vmdb2.vmdb b/worker-vmdb2.vmdb deleted file mode 100644 index be9ab2d..0000000 --- a/worker-vmdb2.vmdb +++ /dev/null @@ -1,49 +0,0 @@ -steps: - - mkimg: "{{ output }}" - size: 4G - - - mklabel: msdos - device: "{{ output }}" - - - mkpart: primary - device: "{{ output }}" - start: 0% - end: 100% - tag: / - - - kpartx: "{{ output }}" - - - mkfs: ext4 - partition: / - - - mount: / - - - virtual-filesystems: / - - - unpack-rootfs: / - - - debootstrap: buster - mirror: http://deb.debian.org/debian - target: / - unless: rootfs_unpacked - - - apt: install - packages: - - linux-image-amd64 - - locales-all - - openssh-server - - python3 - - sudo - tag: / - unless: rootfs_unpacked - - - cache-rootfs: / - unless: rootfs_unpacked - - - fstab: / - - - ansible: / - playbook: worker-vmdb2.yml - - - grub: bios - tag: / diff --git a/worker-vmdb2.yml b/worker-vmdb2.yml deleted file mode 100644 index 112839d..0000000 --- a/worker-vmdb2.yml +++ /dev/null @@ -1,95 +0,0 @@ -- hosts: image - tasks: - - shell: | - echo "{{ host }}" > /etc/hostname - sed -i '/^127\.0\.0.*localhost.*/s/.*/127.0.0.1 localhost {{ host }}/' \ - /etc/hosts - sed -i '/^root:[^:]:/s//root::/' /etc/passwd - - copy: - content: | - auto lo - iface lo inet loopback - - auto eth0 - iface eth0 inet dhcp - dest: /etc/network/interfaces - - copy: - content: "{{ ci_prod_signing_key }}" - dest: /etc/apt/trusted.gpg.d/ci_prod.asc - - apt_repository: - repo: "deb http://ci-prod-controller.vm.liw.fi/debian unstable-ci main" - - apt: - name: - - ansible - - build-essential - - cmdtest - - debootstrap - - dosfstools - - git - - kpartx - - locales-all - - moreutils - - pandoc - - parted - - python3-all - - python3-cliapp - - python3-coverage-test-runner - - python3-jinja2 - - python3-yaml - - qemu-utils - - user: - comment: "Worker" - name: worker - shell: /bin/bash - - file: - state: directory - path: /home/worker/.ssh - owner: worker - group: worker - mode: 0700 - - copy: - src: manager.key.pub - dest: /home/worker/.ssh/authorized_keys - owner: worker - group: worker - mode: 0600 - - copy: - content: | - worker ALL=(ALL:ALL) NOPASSWD: ALL - dest: /etc/sudoers.d/worker - owner: root - group: root - mode: 0600 - vars: - host: worker - ansible_python_interpreter: /usr/bin/python3 - ci_prod_signing_key: | - -----BEGIN PGP PUBLIC KEY BLOCK----- - - mQINBFrLO7kBEADdz6mHstYmKU5Dp6OSjxWtWaqTDOX1sJdmmaIK/9EKVIH0Maxp - 5kvVO5G6mULLAjv/kLG0MxasHPrq8I2A/y8AqKAGVL8QelwLjQMIFZ30/VbGQPHS - +T5TZXEnoQtNce1GUhFwJ38ZyjjwHBFV9tSec7rZ2Q3YeM3nNnGPf6DacXGfEOPO - HIN4sXAN2hzNXNjKRzTIvxQseb6nr7afUh/SlZ3yhQOCrIzmYlD7tP9WJe7ofL0p - JY4pDQYw8rT6nC2BE/ioemh84kERCT1vCe+OVFlSRuMlqfEv+ZpKQ+itOmPDQ/lM - jpUm1K2hrW/lWpxT/ZxHKo/w1K36J5WshgMZxfUu5BMCL9LMqMcrXNhNjDMfxDMM - 3yBPOvQ4ls6fecOZ/bsFo1p8VzMk/w/eG8vPs5yuNa5XxN95yFMXoOHGb5Xbu8D4 - 6yiW+Af70LbiSNpGdmNdneiGB2fY38NxBukPw5u3S5qG8HedSmMr1RvSr5kHoAAe - UbOY+BYaaKsTAT7+1skUW1o3FJSqoRKCHAzTsMWC6zzhR8hRn7jVrrguH1hGbqq5 - TZSCFQZExuTJ7uXrTLG0WoBXIjB5wWNcSeXn8myUWYB51nJNF4tJBouZOz9JwWGl - kiAQkrHnBttLQWdW9FyjbIoTZMtpvVx+m6ObGTGdGL1cNlLAvWprMXGc+QARAQAB - tDJJY2sgQVBUIHJlcG9zaXRvcnkgc2lnbmluZyBrZXkgKDIwMTgpIDxsaXdAbGl3 - LmZpPokCTgQTAQgAOBYhBKL1uyDoXyxUH3O717Wr+TZVS6PGBQJayzu5AhsDBQsJ - CAcCBhUICQoLAgQWAgMBAh4BAheAAAoJELWr+TZVS6PGB5QQANTcikhRUHwt9N4h - dGc/Hp6CbqdshMoWlwpFskttoVDxQG5OAobuZl5XyzGcmja1lT85RGkZFfbca0IZ - LnXOLLSAu51QBkXNaj4OhjK/0uQ+ITrvL6RQSXNgHiUTR/W2XD1GIUq6nBqe2GSN - 31S1baYKKVj5QIMsi7Dq8ls3BBXuPCE+xTSaNmGWjes2t9pPidcRvxsksCLY1qgw - P1GFXBeMkBQ29kBP87SUL15SIk7OiQLlEURCy5iRls5rt/YEsdEpRWIb0Tm5Nrjv - 2M3VM+iBhfNXTwj0rJ34mlycF1qQmA7YcTEobT7z587GPY0VWzBpQUnEQj7rQWPM - cDYY0b+I6kQ8VKOaL4wVAtE98d7HzFIrIrwhTKufnrWrVDPYsmLZ+LPC1jiF7JBD - SR6Vftb+SdDR9xoE1yRuXbC6IfoW+5/qQNrdQ2mm9BFw5jOonBqchs18HTTf3441 - 6SWwP9fY3Vi+IZphPPi0Gf85oMStgnv/Wnw6LacEL32ek39Desero/D8iGLZernK - Q2mC9mua5A/bYGVhsNWyURNFkKdbFa+/wW3NfdKYyZnsSfo+jJ2luNewrhAY7Kod - GWXTer9RxzTGA3EXFGvNr+BBOOxSj0SfWTl0Olo7J5dnxof+jLAUS1VHpceHGHps - GSJSdir7NkZidgwoCPA7BTqsb5LN - =dXB0 - -----END PGP PUBLIC KEY BLOCK----- -- cgit v1.2.1