diff options
| -rw-r--r-- | chaos-at-home/ch-router-obsd.yml | 7 | ||||
| -rw-r--r-- | common/vm-install.yml | 18 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ch-router-obsd.yml | 21 | ||||
| -rw-r--r-- | inventory/hosts.ini | 4 | ||||
| -rw-r--r-- | roles/vm/define/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/vm/define/templates/libvirt-domain.xml.j2 | 9 | ||||
| -rw-r--r-- | roles/vm/install/meta/main.yml | 12 | ||||
| -rw-r--r-- | roles/vm/install/tasks/main.yml | 30 |
9 files changed, 69 insertions, 34 deletions
diff --git a/chaos-at-home/ch-router-obsd.yml b/chaos-at-home/ch-router-obsd.yml new file mode 100644 index 00000000..fe3ef36f --- /dev/null +++ b/chaos-at-home/ch-router-obsd.yml @@ -0,0 +1,7 @@ +--- +- name: Basic Setup + hosts: ch-router-obsd + roles: + #- role: base + - role: sshd + - role: zsh diff --git a/common/vm-install.yml b/common/vm-install.yml index 36f2c4cc..02c95fd8 100644 --- a/common/vm-install.yml +++ b/common/vm-install.yml @@ -45,15 +45,15 @@ set_fact: ansible_ssh_extra_args: "" -- name: apply basic VM configuration roles - hosts: "{{ hostname }}" - pre_tasks: - - name: make sure to update cached facts - setup: - roles: - - role: vm/grub - - role: vm/network - - role: vm/guest +# - name: apply basic VM configuration roles +# hosts: "{{ hostname }}" +# pre_tasks: +# - name: make sure to update cached facts +# setup: +# roles: +# - role: vm/grub +# - role: vm/network +# - role: vm/guest - import_playbook: "../{{ hostenv }}/{{ hostname }}.yml" diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 73aa2975..28a29081 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -43,6 +43,7 @@ network_zones: ch-stats: 10 ch-web: 80 ch-mail: 143 + ch-router-obsd: 253 ch-router: 254 mgmt: diff --git a/inventory/host_vars/ch-router-obsd.yml b/inventory/host_vars/ch-router-obsd.yml new file mode 100644 index 00000000..48788004 --- /dev/null +++ b/inventory/host_vars/ch-router-obsd.yml @@ -0,0 +1,21 @@ +--- +vm_host: ch-gnocchi + +install: + host: "{{ vm_host }}" + mem: 512 + numcpu: 1 + disks: + primary: /dev/sda + virtio: + vda: + type: lvm + vg: "{{ hostvars[vm_host].host_name }}" + lv: "{{ inventory_hostname }}" + size: 10g + interfaces: + - bridge: br-svc + name: vi0 + autostart: True + +network: {} diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 4d136bd3..b45fb494 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -21,9 +21,9 @@ ch-testvm host_name=testvm ch-mimas2 host_name=mimas ch-gnocchi host_name=gnocchi ch-router host_name=router +ch-router-obsd host_name=router ansible_port=22 ch-gw-lan host_name=gw-lan ch-jump host_name=jump ansible_port=2342 ansible_host=ch-jump -ch-router-obsd ansible_port=4222 [chaos-at-home:children] mz-chaos-at-home @@ -194,6 +194,8 @@ ch-keyserver ch-testvm ch-gw-lan ch-jump +ch-router +ch-router-obsd r3-vex2 r3-cccamp19-flora r3-cccamp19-verr diff --git a/roles/vm/define/tasks/main.yml b/roles/vm/define/tasks/main.yml index 202644dd..4c2b99e1 100644 --- a/roles/vm/define/tasks/main.yml +++ b/roles/vm/define/tasks/main.yml @@ -23,7 +23,6 @@ name: "{{ hostname }}" command: undefine - - name: define vm virt: command: define diff --git a/roles/vm/define/templates/libvirt-domain.xml.j2 b/roles/vm/define/templates/libvirt-domain.xml.j2 index c7e3a2f2..a6aea91c 100644 --- a/roles/vm/define/templates/libvirt-domain.xml.j2 +++ b/roles/vm/define/templates/libvirt-domain.xml.j2 @@ -42,11 +42,16 @@ </rng> {% if vm_define_installer and install_distro == 'openbsd' %} - <disk type='block' device='cdrom'> - <driver name='qemu' type='raw'/> + <disk type='file' device='cdrom'> + <driver name='qemu'/> <source file='{{ installer_path }}/openbsd-{{ install_codename }}/{{ hostvars[hostname].install_cooked.arch | default('amd64') }}/install.iso'/> <target dev='hdc' bus='ide'/> + <readonly/> </disk> + + <graphics type='vnc' port='5904' sharePolicy='allow-exclusive'> + <listen type='address' address='127.0.0.1'/> + </graphics> {% endif %} {% if 'virtio' in hostvars[hostname].install_cooked.disks %} diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml index 710f90ad..347e30c4 100644 --- a/roles/vm/install/meta/main.yml +++ b/roles/vm/install/meta/main.yml @@ -1,7 +1,7 @@ --- -dependencies: - - role: installer/debian - distros: - - distro: "{{ install_distro }}" - codename: "{{ install_codename }}" - arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ] +# dependencies: +# - role: installer/debian +# distros: +# - distro: "{{ install_distro }}" +# codename: "{{ install_codename }}" +# arch: [ "{{ hostvars[hostname].install_cooked.arch | default('amd64') }}" ] diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index 162ece24..10b10e18 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -28,22 +28,22 @@ state: directory register: tmpdir - - import_role: - name: preseed - vars: - ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" - preseed_tmpdir: "{{ tmpdir.path }}" - preseed_force_net_ifnames_policy: path - preseed_no_netplan: yes - install_interface: enp1s1 + # - import_role: + # name: preseed + # vars: + # ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" + # preseed_tmpdir: "{{ tmpdir.path }}" + # preseed_force_net_ifnames_policy: path + # preseed_no_netplan: yes + # install_interface: enp1s1 - - name: Make preseed workdir readable by qemu - acl: - path: "{{ tmpdir.path }}" - state: present - entity: libvirt-qemu - etype: user - permissions: rx + # - name: Make preseed workdir readable by qemu + # acl: + # path: "{{ tmpdir.path }}" + # state: present + # entity: libvirt-qemu + # etype: user + # permissions: rx - import_role: name: vm/define |