From 87a06e08d218f564e655f0825802fbaf2f9169b1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 4 Sep 2016 13:21:22 +0000 Subject: [PATCH] aarch64: use virt_install_command_aarch64 command given difference in console/wdog --- inventory/group_vars/all | 4 ++-- inventory/group_vars/buildvm-aarch64 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index ccbcabdada..abffaae026 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -61,11 +61,11 @@ virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} --network bridge={{ main_bridge }},model=virtio --autostart --noautoconsole --watchdog default -virt_install_command_nowdog: virt-install -n {{ inventory_hostname }} +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=ttyS0 + '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 diff --git a/inventory/group_vars/buildvm-aarch64 b/inventory/group_vars/buildvm-aarch64 index ad1179161d..e10e3d3e1b 100644 --- a/inventory/group_vars/buildvm-aarch64 +++ b/inventory/group_vars/buildvm-aarch64 @@ -12,7 +12,7 @@ nm: 255.255.255.0 gw: 10.5.129.254 dns: 10.5.126.21 main_bridge: br0 -virt_install_command: "{{ virt_install_command_nowdog }}" +virt_install_command: "{{ virt_install_command_aarch64 }}" # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file