From 4a6d00f0004349ae0ad2fc8901ade6379d01bb6f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 23 Jan 2017 05:09:47 +0000 Subject: [PATCH] virt inst: add aarch64 one/two nic options --- inventory/group_vars/all | 32 ++++++++++++------- inventory/group_vars/buildvm-aarch64 | 2 +- ...ildvm-aarch64-01.stg.arm.fedoraproject.org | 2 +- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index 69ea57e281..4001d956fc 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -77,17 +77,6 @@ virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} --network bridge={{ main_bridge }},model=virtio --autostart --noautoconsole --watchdog default -virt_install_command_aarch64: virt-install -n {{ inventory_hostname }} - --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x - 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyAMA0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none' - --network bridge={{ main_bridge }},model=virtio --network=bridge={{ nfs_bridge }},model=virtio - --autostart --noautoconsole - virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} @@ -99,6 +88,27 @@ virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} --network bridge={{ main_bridge }},model=virtio --network=bridge={{ nfs_bridge }},model=virtio --autostart --noautoconsole --watchdog default +virt_install_command_aarch64_one_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x + 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyAMA0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none + --network bridge={{ main_bridge }},model=virtio + --autostart --noautoconsole + +virt_install_command_aarch64_two_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x + 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyAMA0 + hostname={{ inventory_hostname }} nameserver={{ dns }} + ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none + ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none' + --network bridge={{ main_bridge }},model=virtio --network=bridge={{ nfs_bridge }},model=virtio + --autostart --noautoconsole + virt_install_command_rhel6: virt-install -n {{ inventory_hostname }} --memory={{ mem_size }},maxmemory={{ max_mem_size }} --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm-aarch64 index 15c55c64a0..54a2ce17c0 100644 --- a/inventory/group_vars/buildvm-aarch64 +++ b/inventory/group_vars/buildvm-aarch64 @@ -16,7 +16,7 @@ dns: 10.5.126.21 # when compared to the host. main_bridge: br1 nfs_bridge: br0 -virt_install_command: "{{ virt_install_command_aarch64 }}" +virt_install_command: "{{ virt_install_command_aarch64_two_nic }}" krb_builder: True diff --git a/inventory/host_vars/buildvm-aarch64-01.stg.arm.fedoraproject.org b/inventory/host_vars/buildvm-aarch64-01.stg.arm.fedoraproject.org index eb998a2bae..dcbbee6066 100644 --- a/inventory/host_vars/buildvm-aarch64-01.stg.arm.fedoraproject.org +++ b/inventory/host_vars/buildvm-aarch64-01.stg.arm.fedoraproject.org @@ -9,7 +9,7 @@ volgroup: /dev/vg_Server eth0_ip: 10.5.129.232 gw: 10.5.129.254 main_bridge: br1 -virt_install_command: "{{ virt_install_command_aarch64 }}" +virt_install_command: "{{ virt_install_command_aarch64_one_nic }}" ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-25-aarch64 ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/25/Everything/aarch64/os/