From 971f1cb682e0d1e7bd83af07e6fe206e42e6ec6f Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 2 Feb 2016 17:15:52 +0000 Subject: [PATCH] Consolidate all our virt_install_commands down to just two in group_vars/all. Also tweak them with some more features, namely to set maxram and maxvcpus so we can increase on the fly. --- inventory/group_vars/all | 36 ++++++++++++------- inventory/group_vars/bodhi-backend | 10 +----- inventory/group_vars/bodhi-backend-stg | 9 ----- inventory/group_vars/buildppc | 17 ++++----- inventory/group_vars/buildppcle | 16 ++++----- inventory/group_vars/buildvm | 10 +----- inventory/group_vars/buildvm-ppc64 | 8 ----- inventory/group_vars/buildvm-ppc64le | 8 ----- inventory/group_vars/buildvm-stg | 8 ----- inventory/group_vars/composers | 11 +----- inventory/group_vars/koji | 11 +----- inventory/group_vars/kojipkgs | 11 +----- inventory/group_vars/mailman-stg | 10 ------ inventory/group_vars/releng | 10 +----- inventory/group_vars/resultsdb-prod | 8 ----- .../host_vars/arm-koji01.qa.fedoraproject.org | 9 +---- .../batcave01.phx2.fedoraproject.org | 10 +----- .../compose-x86-01.phx2.fedoraproject.org | 10 +----- .../composer.stg.phx2.fedoraproject.org | 10 +----- .../host_vars/download-ib02.fedoraproject.org | 8 ----- .../gnome-backups01.phx2.fedoraproject.org | 10 +----- .../host_vars/mdapi01.phx2.fedoraproject.org | 9 ----- .../mdapi01.stg.phx2.fedoraproject.org | 9 ----- .../mm-backend01.phx2.fedoraproject.org | 10 +----- .../mm-backend01.stg.phx2.fedoraproject.org | 10 +----- .../openqa-stg01.qa.fedoraproject.org | 9 ----- .../host_vars/openqa01.qa.fedoraproject.org | 9 ----- .../host_vars/pkgs02.phx2.fedoraproject.org | 10 +----- .../host_vars/qa-stg01.qa.fedoraproject.org | 11 ------ .../host_vars/qadevel.qa.fedoraproject.org | 11 ------ .../resultsdb-dev01.qa.fedoraproject.org | 10 ------ .../resultsdb-stg01.qa.fedoraproject.org | 9 ----- .../resultsdb01.qa.fedoraproject.org | 10 ------ .../s390-koji01.qa.fedoraproject.org | 9 +---- .../secondary01.phx2.fedoraproject.org | 10 +----- .../taskotron-dev01.qa.fedoraproject.org | 9 ----- .../taskotron-stg01.qa.fedoraproject.org | 9 ----- .../taskotron01.qa.fedoraproject.org | 10 ------ 38 files changed, 52 insertions(+), 352 deletions(-) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index b51d170f79..a38b0a6113 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -34,23 +34,33 @@ mem_size: 2048 num_cpus: 2 lvm_size: 20000 -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -#virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} -# --disk {{ volgroup }}/{{ inventory_hostname }} -# --vcpus={{ num_cpus }} -l {{ ks_repo }} -x -# "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} -# gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 -# hostname={{ inventory_hostname }}" -# --network=bridge=br0 --autostart --noautoconsole +# +# The default virt-install works for rhel7 or fedora with 1 nic +# +virt_install_command: "{{ virt_install_command_one_nic }}" -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} +main_bridge: br0 +nfs_bridge: br1 + +virt_install_command_one_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ mem_size * 2 }} --memballoon virtio --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - 'ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 + --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 2 }} -l {{ ks_repo }} -x + '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' - --network bridge=br0,model=virtio + --network bridge={{ main_bridge }},model=virtio + --autostart --noautoconsole --watchdog default + +virt_install_command_two_nic: virt-install -n {{ inventory_hostname }} + --memory={{ mem_size }},maxmemory={{ mem_size * 2 }} --memballoon virtio + --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} + --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 2 }} -l {{ ks_repo }} -x + '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" + --network bridge={{ main_bridge }},model=virtio --network=bridge={{ nfs_bridge }},model=virtio --autostart --noautoconsole --watchdog default # This is the wildcard certname for our proxies. It has a different name for diff --git a/inventory/group_vars/bodhi-backend b/inventory/group_vars/bodhi-backend index eb99ab9d3e..27e4d2c62e 100644 --- a/inventory/group_vars/bodhi-backend +++ b/inventory/group_vars/bodhi-backend @@ -10,15 +10,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" # These are for fedmsg publication from the bodhi backend. # If you change these iptables rules, you also need to changes the endpoints diff --git a/inventory/group_vars/bodhi-backend-stg b/inventory/group_vars/bodhi-backend-stg index eef7fe514f..03215dd64d 100644 --- a/inventory/group_vars/bodhi-backend-stg +++ b/inventory/group_vars/bodhi-backend-stg @@ -10,15 +10,6 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }} netmask={{ nm }} gateway={{ gw }} dns={{ dns }}" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole - # These are for fedmsg publication from the bodhi backend. # If you change these iptables rules, you also need to changes the endpoints # list in roles/fedmsg/base/templates/endpoints-bodhi.py diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc index acd007800e..d0891f9f60 100644 --- a/inventory/group_vars/buildppc +++ b/inventory/group_vars/buildppc @@ -9,16 +9,13 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64/os/ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --graphics none --serial pty - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0 - 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=br3,model=virtio --network=bridge=br2,model=virtio - --autostart --noautoconsole; sleep 5 + +# +# The ppc virthosts have different bridge names for the main and nfs bridges. +# +main_bridge: br3 +nfs_bridge: br2 +virt_install_command: "{{ virt_install_command_two_nic }}" # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/buildppcle b/inventory/group_vars/buildppcle index 3d9ea1b871..8c001a248f 100644 --- a/inventory/group_vars/buildppcle +++ b/inventory/group_vars/buildppcle @@ -9,16 +9,12 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64le/os/ nm: 255.255.255.0 gw: 10.5.125.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --graphics none --serial pty - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0 - 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=br3,model=virtio --network=bridge=br2,model=virtio - --autostart --noautoconsole; sleep 5 +# +# The ppc virthosts have different bridge names for the main and nfs bridges. +# +main_bridge: br3 +nfs_bridge: br2 +virt_install_command: "{{ virt_install_command_two_nic }}" # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm index f92ddab3f1..64d9818bb5 100644 --- a/inventory/group_vars/buildvm +++ b/inventory/group_vars/buildvm @@ -10,15 +10,7 @@ nm: 255.255.255.0 gw: 10.5.125.254 eth1_gw: 10.5.127.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole; sleep 5 +virt_install_command: "{{ virt_install_command_two_nic }}" # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64 index 13a12fbad9..ef70bc9a91 100644 --- a/inventory/group_vars/buildvm-ppc64 +++ b/inventory/group_vars/buildvm-ppc64 @@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64/os/ nm: 255.255.255.128 gw: 10.5.124.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --graphics none --serial pty - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" - --network=bridge=br0,model=virtio --autostart --noautoconsole; sleep 5 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le index ce6e1eee0a..f7af05d98f 100644 --- a/inventory/group_vars/buildvm-ppc64le +++ b/inventory/group_vars/buildvm-ppc64le @@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora-secondary/releases/23/Server/ppc64le/os/ nm: 255.255.255.128 gw: 10.5.124.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --graphics none --serial pty - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "net.ifnames=0 ksdevice=eth0 ks={{ ks_url }} console=tty0 console=hvc0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" - --network=bridge=br0,model=virtio --autostart --noautoconsole; sleep 5 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg index 0c58875ffe..e0d569bb20 100644 --- a/inventory/group_vars/buildvm-stg +++ b/inventory/group_vars/buildvm-stg @@ -9,14 +9,6 @@ ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/ nm: 255.255.255.0 gw: 10.5.126.254 dns: 10.5.126.21 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file diff --git a/inventory/group_vars/composers b/inventory/group_vars/composers index 240c3d94fd..f5193d7338 100644 --- a/inventory/group_vars/composers +++ b/inventory/group_vars/composers @@ -9,16 +9,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ - -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" # With 16 cpus, theres a bunch more kernel threads nrpe_procs_warn: 900 diff --git a/inventory/group_vars/koji b/inventory/group_vars/koji index 034c32c92c..bd75a856fe 100644 --- a/inventory/group_vars/koji +++ b/inventory/group_vars/koji @@ -42,13 +42,4 @@ fedmsg_certs: - buildsys.untag nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" - -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/group_vars/kojipkgs b/inventory/group_vars/kojipkgs index 5bcc9087bc..5a977e3bb4 100644 --- a/inventory/group_vars/kojipkgs +++ b/inventory/group_vars/kojipkgs @@ -32,13 +32,4 @@ csi_relationship: | - koschei - external users downloading packages from koji. -# Need a eth0/eth1 install here. -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/group_vars/mailman-stg b/inventory/group_vars/mailman-stg index aa54d4fc3f..7deb18d006 100644 --- a/inventory/group_vars/mailman-stg +++ b/inventory/group_vars/mailman-stg @@ -26,16 +26,6 @@ fedmsg_certs: can_send: - mailman.receive -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole - # Postfix main.cf postfix_group: mailman-stg diff --git a/inventory/group_vars/releng b/inventory/group_vars/releng index e3faac2117..03ba77ffeb 100644 --- a/inventory/group_vars/releng +++ b/inventory/group_vars/releng @@ -10,15 +10,7 @@ dns: 10.5.126.21 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" # With 16 cpus, theres a bunch more kernel threads nrpe_procs_warn: 900 diff --git a/inventory/group_vars/resultsdb-prod b/inventory/group_vars/resultsdb-prod index d6db2fe42f..dcd4e56005 100644 --- a/inventory/group_vars/resultsdb-prod +++ b/inventory/group_vars/resultsdb-prod @@ -11,14 +11,6 @@ fas_client_groups: sysadmin-qa nrpe_procs_warn: 250 nrpe_procs_crit: 300 -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" - --network=bridge=br0,model=virtio --autostart --noautoconsole - deployment_type: prod resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org diff --git a/inventory/host_vars/arm-koji01.qa.fedoraproject.org b/inventory/host_vars/arm-koji01.qa.fedoraproject.org index 1d3ffda5ed..9dae9e193c 100644 --- a/inventory/host_vars/arm-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/arm-koji01.qa.fedoraproject.org @@ -25,14 +25,7 @@ sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" # # define this here because arm koji only needs eth0, not eth1 also # -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" - --network=bridge=br0,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_one_nic }}" koji_topurl: "http://arm.fedoraproject.org/" koji_server_url: "http://arm.koji.fedoraproject.org/kojihub" diff --git a/inventory/host_vars/batcave01.phx2.fedoraproject.org b/inventory/host_vars/batcave01.phx2.fedoraproject.org index 7cc0d48148..cea9698f2f 100644 --- a/inventory/host_vars/batcave01.phx2.fedoraproject.org +++ b/inventory/host_vars/batcave01.phx2.fedoraproject.org @@ -21,12 +21,4 @@ host_backup_targets: ['/git', '/mnt/fedora/app/attachments'] # # We need this to install with 2 nics # -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org index 04c54fe28f..a60eadfb69 100644 --- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org @@ -9,15 +9,7 @@ libdir: /usr/lib64 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-21 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/ -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" lvm_size: 30000 mem_size: 8192 diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index 504f0c102d..a54cd661e3 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -19,15 +19,7 @@ kojihub_scheme: http nfs_mount_opts: rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/host_vars/download-ib02.fedoraproject.org b/inventory/host_vars/download-ib02.fedoraproject.org index a6b6d5aa42..6637e10991 100644 --- a/inventory/host_vars/download-ib02.fedoraproject.org +++ b/inventory/host_vars/download-ib02.fedoraproject.org @@ -18,11 +18,3 @@ nrpe_procs_crit: 1000 lvm_size: 20000 mem_size: 8192 num_cpus: 4 - -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk {{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole diff --git a/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org b/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org index d76bbe8935..119a599d8a 100644 --- a/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org +++ b/inventory/host_vars/gnome-backups01.phx2.fedoraproject.org @@ -14,15 +14,7 @@ ks_repo: http://infrastructure.phx2.fedoraproject.org/repo/rhel/RHEL7-x86_64/ # # Need a virt-install command with eth1 also # -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" lvm_size: 30000 mem_size: 8192 diff --git a/inventory/host_vars/mdapi01.phx2.fedoraproject.org b/inventory/host_vars/mdapi01.phx2.fedoraproject.org index 12c83d128b..7b75a4cd48 100644 --- a/inventory/host_vars/mdapi01.phx2.fedoraproject.org +++ b/inventory/host_vars/mdapi01.phx2.fedoraproject.org @@ -10,12 +10,3 @@ volgroup: /dev/vg_bvirthost09 eth0_ip: 10.5.125.50 vmhost: bvirthost09.phx2.fedoraproject.org datacenter: phx2 - -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - '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' - --network bridge=br0,model=virtio - --autostart --noautoconsole --watchdog default diff --git a/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org b/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org index 976f57a1d7..02601bbb38 100644 --- a/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mdapi01.stg.phx2.fedoraproject.org @@ -10,12 +10,3 @@ volgroup: /dev/vg_guests eth0_ip: 10.5.126.206 vmhost: virthost11.phx2.fedoraproject.org datacenter: phx2 - -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - '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' - --network bridge=br0,model=virtio - --autostart --noautoconsole --watchdog default diff --git a/inventory/host_vars/mm-backend01.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.phx2.fedoraproject.org index 31b9204ab3..d89d399f11 100644 --- a/inventory/host_vars/mm-backend01.phx2.fedoraproject.org +++ b/inventory/host_vars/mm-backend01.phx2.fedoraproject.org @@ -16,12 +16,4 @@ datacenter: phx2 nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3" # We define this here to override the global one because we need eth1 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org index 43e99d6c2a..173f6eea5c 100644 --- a/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/mm-backend01.stg.phx2.fedoraproject.org @@ -17,12 +17,4 @@ datacenter: phx2 nfs_mount_opts: "ro,hard,bg,intr,nodev,nosuid,nfsvers=3" # We define this here to override the global one because we need eth1 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org b/inventory/host_vars/openqa-stg01.qa.fedoraproject.org index 92d53e2a35..34c26cf5d1 100644 --- a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/openqa-stg01.qa.fedoraproject.org @@ -30,12 +30,3 @@ num_cpus: 4 nrpe_procs_warn: 250 nrpe_procs_crit: 300 - -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole diff --git a/inventory/host_vars/openqa01.qa.fedoraproject.org b/inventory/host_vars/openqa01.qa.fedoraproject.org index 02c3ff078c..11dfc95cac 100644 --- a/inventory/host_vars/openqa01.qa.fedoraproject.org +++ b/inventory/host_vars/openqa01.qa.fedoraproject.org @@ -30,12 +30,3 @@ num_cpus: 4 nrpe_procs_warn: 250 nrpe_procs_crit: 300 - -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole diff --git a/inventory/host_vars/pkgs02.phx2.fedoraproject.org b/inventory/host_vars/pkgs02.phx2.fedoraproject.org index 4ddd88c861..12a31cc94c 100644 --- a/inventory/host_vars/pkgs02.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs02.phx2.fedoraproject.org @@ -14,15 +14,7 @@ mem_size: 16384 num_cpus: 8 # Need a eth0/eth1 install here. -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" host_backup_targets: ['/srv'] nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3" diff --git a/inventory/host_vars/qa-stg01.qa.fedoraproject.org b/inventory/host_vars/qa-stg01.qa.fedoraproject.org index 25c49ad95a..6b20df681f 100644 --- a/inventory/host_vars/qa-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/qa-stg01.qa.fedoraproject.org @@ -10,17 +10,6 @@ vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole - mariadb_root_password: "{{ qa_stg_mariadb_root_password }}" public_hostname: qa.stg.fedoraproject.org diff --git a/inventory/host_vars/qadevel.qa.fedoraproject.org b/inventory/host_vars/qadevel.qa.fedoraproject.org index 50c9d3a4be..b4fdc166d1 100644 --- a/inventory/host_vars/qadevel.qa.fedoraproject.org +++ b/inventory/host_vars/qadevel.qa.fedoraproject.org @@ -11,17 +11,6 @@ datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole - mariadb_root_password: "{{ qadevel_mariadb_root_password }}" public_hostname: qadevel.qa.fedoraproject.org diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org index 8f28b1fd36..f388ef0ae9 100644 --- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org @@ -20,16 +20,6 @@ volgroup: /dev/VirtGuests vmhost: virthost-comm02.qa.fedoraproject.org datacenter: phx2 -virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole - - ############################################################ # virtual machine ############################################################ diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org index 2039198973..a6fb50ec56 100644 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org @@ -20,15 +20,6 @@ volgroup: /dev/vg_guests vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole - - ############################################################ # virtual machine ############################################################ diff --git a/inventory/host_vars/resultsdb01.qa.fedoraproject.org b/inventory/host_vars/resultsdb01.qa.fedoraproject.org index c6400bea97..88a701631e 100644 --- a/inventory/host_vars/resultsdb01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb01.qa.fedoraproject.org @@ -19,16 +19,6 @@ volgroup: /dev/VirtGuests datacenter: phx2 vmhost: virthost-comm03.qa.fedoraproject.org -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole - ############################################################ # virtual machine ############################################################ diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.qa.fedoraproject.org index 8637838d24..e9bc5a5842 100644 --- a/inventory/host_vars/s390-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/s390-koji01.qa.fedoraproject.org @@ -25,14 +25,7 @@ sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" # # define this here because s390 koji only needs eth0, not eth1 also # -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_one_nic }}" koji_topurl: "http://s390pkgs.fedoraproject.org/" koji_server_url: "http://s390.koji.fedoraproject.org/kojihub" diff --git a/inventory/host_vars/secondary01.phx2.fedoraproject.org b/inventory/host_vars/secondary01.phx2.fedoraproject.org index 46988fa51b..c53704d3e0 100644 --- a/inventory/host_vars/secondary01.phx2.fedoraproject.org +++ b/inventory/host_vars/secondary01.phx2.fedoraproject.org @@ -18,12 +18,4 @@ vmhost: virthost02.phx2.fedoraproject.org datacenter: phx2 # We define this here to override the global one because we need eth1 -virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "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" - --network=bridge=br0,model=virtio --network=bridge=br1,model=virtio - --autostart --noautoconsole +virt_install_command: "{{ virt_install_command_two_nic }}" diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org index 4bde5046c6..3ea041015e 100644 --- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org @@ -31,15 +31,6 @@ num_cpus: 4 nrpe_procs_warn: 250 nrpe_procs_crit: 300 -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ksdevice=eth0 ks={{ ks_url }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }} nameserver={{ dns }} - ip={{ eth0_ip }}::{{ gw }}:{{ nm }}:{{ inventory_hostname }}:eth0:none - net.ifnames=0" - --network=bridge=br0,model=virtio --autostart --noautoconsole - ############################################################ # taskotron master ############################################################ diff --git a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org index ca36bc3496..788e40b7b6 100644 --- a/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-stg01.qa.fedoraproject.org @@ -33,15 +33,6 @@ num_cpus: 4 nrpe_procs_warn: 250 nrpe_procs_crit: 300 -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole - - ############################################################ # taskotron master ############################################################ diff --git a/inventory/host_vars/taskotron01.qa.fedoraproject.org b/inventory/host_vars/taskotron01.qa.fedoraproject.org index e354461de0..9876076bf4 100644 --- a/inventory/host_vars/taskotron01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron01.qa.fedoraproject.org @@ -25,16 +25,6 @@ sudoers: "{{ private }}/files/sudo/qavirt-sudoers" vmhost: virthost-comm03.qa.fedoraproject.org volgroup: /dev/VirtGuests -# default virt install command is for a single nic-device -# define in another group file for more nics (see buildvm) -virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ mem_size }} - --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }} - --vcpus={{ num_cpus }} -l {{ ks_repo }} -x - "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }} - gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0 - hostname={{ inventory_hostname }}" - --network=bridge=br0 --autostart --noautoconsole - ############################################################ # virtual machine ############################################################