From ddb43fb5860676f7e3292fdd65856572339ebce7 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 22 Nov 2017 23:34:09 +0100 Subject: added inital role vm-host --- roles/vm-install/tasks/main.yaml | 6 ++---- roles/vm-install/templates/libvirt-domain.xml.j2 | 6 +++--- roles/vm-install/templates/preseed_stretch.cfg.j2 | 12 ++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) (limited to 'roles/vm-install') diff --git a/roles/vm-install/tasks/main.yaml b/roles/vm-install/tasks/main.yaml index 214db25a..ef5af38e 100644 --- a/roles/vm-install/tasks/main.yaml +++ b/roles/vm-install/tasks/main.yaml @@ -2,10 +2,8 @@ - name: generate preseed file template: src: "preseed_{{ vmdistro }}.cfg.j2" - dest: "/home/rhadmin/ansible/preseed/vm-{{ inventory_hostname }}-{{ vmdistro }}.cfg" - owner: rhadmin - group: rhadmin - delegate_to: ansible + dest: "{{ hostvars[vm_install.host].vm_host.installer.preseed_path }}/vm-{{ inventory_hostname }}-{{ vmdistro }}.cfg" + delegate_to: "{{ vm_install.host }}" - name: create disks for vm with_dict: "{{ vm_install.disks.virtio | default({}) | combine(vm_install.disks.scsi | default({})) }}" diff --git a/roles/vm-install/templates/libvirt-domain.xml.j2 b/roles/vm-install/templates/libvirt-domain.xml.j2 index c95019eb..da09dca2 100644 --- a/roles/vm-install/templates/libvirt-domain.xml.j2 +++ b/roles/vm-install/templates/libvirt-domain.xml.j2 @@ -6,9 +6,9 @@ hvm {% if run_installer %} - /home/rhadmin/installer/{{ vmdistro }}/{{ vm_install.arch | default('amd64') }}/linux - /home/rhadmin/installer/{{ vmdistro }}/{{ vm_install.arch | default('amd64') }}/initrd.gz - console=ttyS0,115200n8 auto=true interface=auto url=http://ansible.helsinki.at/preseed/vm-{{ inventory_hostname }}-{{ vmdistro }}.cfg netcfg/choose_interface=enp1s1 netcfg/disable_autoconfig=true netcfg/get_ipaddress={{ srv_network.internal.ip }} netcfg/get_netmask=255.255.255.0 netcfg/get_gateway=192.168.1.254 netcfg/get_nameservers=192.168.1.254 netcfg/confirm_static=true netcfg/get_hostname={{ inventory_hostname }} netcfg/get_domain=helsinki.at + {{ hostvars[vm_install.host].vm_host.installer.path }}/{{ vmdistro }}/{{ vm_install.arch | default('amd64') }}/linux + {{ hostvars[vm_install.host].vm_host.installer.path }}/{{ vmdistro }}/{{ vm_install.arch | default('amd64') }}/initrd.gz + console=ttyS0,115200n8 auto=true interface=auto url=tftp://{{ hostvars[vm_install.host]['ansible_' + hostvars[vm_install.host].vm_host.installer.net_if].ipv4.address }}/vm-{{ inventory_hostname }}-{{ vmdistro }}.cfg netcfg/choose_interface=enp1s1 netcfg/disable_autoconfig=true netcfg/get_ipaddress={{ vm_network.internet.ip }} netcfg/get_netmask={{ vm_network.internet.mask }} netcfg/get_gateway={{ vm_network.internet.gateway }} netcfg/get_nameservers={{ vm_network.internet.nameservers }} netcfg/confirm_static=true netcfg/get_hostname={{ inventory_hostname }} netcfg/get_domain={{ vm_network.internet.domain }} {% endif %} diff --git a/roles/vm-install/templates/preseed_stretch.cfg.j2 b/roles/vm-install/templates/preseed_stretch.cfg.j2 index b197395e..1d91b8c7 100644 --- a/roles/vm-install/templates/preseed_stretch.cfg.j2 +++ b/roles/vm-install/templates/preseed_stretch.cfg.j2 @@ -10,14 +10,14 @@ d-i keyboard-configuration/xkb-keymap select de #d-i netcfg/choose_interface select enp1s1 #d-i netcfg/disable_autoconfig boolean false -#d-i netcfg/get_ipaddress string {{ srv_network.internal.ip }} -#d-i netcfg/get_netmask string 255.255.255.0 -#d-i netcfg/get_gateway string 192.168.1.254 -#d-i netcfg/get_nameservers string 192.168.1.254 +#d-i netcfg/get_ipaddress string {{ vm_network.internet.ip }} +#d-i netcfg/get_netmask string {{ vm_network.internet.mask }} +#d-i netcfg/get_gateway string {{ vm_network.internet.gateway }} +#d-i netcfg/get_nameservers string {{ vm_network.internet.nameservers }} #d-i netcfg/confirm_static boolean true d-i netcfg/get_hostname string {{ inventory_hostname }} -d-i netcfg/get_domain string helsinki.at +d-i netcfg/get_domain string {{ vm_network.internet.domain }} d-i netcfg/wireless_wep string @@ -98,4 +98,4 @@ d-i grub-installer/with_other_os boolean false d-i finish-install/reboot_in_progress note -d-i preseed/late_command string in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDSWnaaAe6PwzB+XaU4kLUnc7BaUbg6wtgLv3M9JkUix ansible config-management' > /root/.ssh/authorized_keys" +d-i preseed/late_command string in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo '{{ root_ssh_keys | default('') }}' > /root/.ssh/authorized_keys" -- cgit v1.2.3