From ced032b5b388ebb79298f4357d9b8c13db5e2451 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 20 Nov 2019 22:47:27 +0000
Subject: [PATCH] virt-installs: drop debugging and set all eth1 hostnames to
 use short-hostname.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 inventory/group_vars/all | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inventory/group_vars/all b/inventory/group_vars/all
index 8434b67ed8..59d9989908 100644
--- a/inventory/group_vars/all
+++ b/inventory/group_vars/all
@@ -100,7 +100,7 @@ virt_install_command_two_nic: virt-install -n {{ inventory_hostname }}
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --watchdog default --rng /dev/random
@@ -119,7 +119,7 @@ virt_install_command_two_nic_unsafe: virt-install -n {{ inventory_hostname }}
                  --memory={{ mem_size }},maxmemory={{ max_mem_size }} --memballoon virtio
                  --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }},cache=unsafe,io=threads
                  --vcpus={{ num_cpus }},maxvcpus={{ max_cpu }} -l {{ ks_repo }} -x
-                 'net.ifnames=0 rd.debug rd.udev.debug ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
+                 'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:on
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:on'
@@ -134,7 +134,7 @@ virt_install_command_ppc64le_two_nic_unsafe: virt-install --machine pseries-4.0
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --watchdog default --rng /dev/random
@@ -166,7 +166,7 @@ virt_install_command_aarch64_two_nic: virt-install -n {{ inventory_hostname }}
                  'net.ifnames=0 ksdevice=eth0 ks={{ ks_url }}
                   hostname={{ inventory_hostname }} nameserver={{ dns }}
                   ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none
-                  ip={{ eth1_ip }}:::{{ nm }}:{{ inventory_hostname }}-nfs:eth1:none'
+                  ip={{ eth1_ip }}:::{{ nm }}:{{ short_hostname }}-nfs:eth1:none'
                  --network bridge={{ main_bridge }},model=virtio,mac={{ mac_address }}
                  --network=bridge={{ nfs_bridge }},model=virtio,mac={{ mac_address1 }}
                  --autostart --noautoconsole --rng /dev/random