Add a rhel6 version of virt-install

inventory/group_vars/all

@@ -63,6 +63,15 @@ 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_rhel6: /usr/sbin/virt-install -n {{ inventory_hostname }}
+                 --memory={{ mem_size }},maxmemory={{ mem_size * 2 }}
+                 --disk bus=virtio,path={{ volgroup }}/{{ inventory_hostname }}
+                 --vcpus={{ num_cpus }},maxvcpus={{ num_cpus * 2 }}  -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 --watchdog default
+
 # This is the wildcard certname for our proxies.  It has a different name for
 # the staging group and is used in the proxies.yml playbook.
 wildcard_cert_name: wildcard-2014.fedoraproject.org

inventory/group_vars/ask

@@ -34,6 +34,7 @@ fedmsg_certs:
   - askbot.post.flag_offensive.delete
   - askbot.tag.update
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 # For the MOTD
 csi_security_category: Low

inventory/group_vars/ask-stg

@@ -34,6 +34,8 @@ fedmsg_certs:
   - askbot.post.flag_offensive.delete
   - askbot.tag.update
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # For the MOTD
 csi_security_category: Low
 csi_primary_contact: Fedora admins - admin@fedoraproject.org

inventory/group_vars/beaker

@@ -14,6 +14,8 @@ nrpe_procs_crit: 300
 
 freezes: false
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should ovveride them with specific info.
 # See http://infrastructure.fedoraproject.org/csi/security-policy/

inventory/group_vars/beaker-stg

@@ -11,6 +11,8 @@ nrpe_procs_crit: 300
 
 freezes: false
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # settings for the beaker db, server and lab controller
 beaker_db_host: localhost
 beaker_db_name: beaker

inventory/group_vars/docs-backend

@@ -4,6 +4,7 @@ mem_size: 1024
 num_cpus: 1
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80, 873 ]
 fas_client_groups: sysadmin-noc,sysadmin-docs

inventory/group_vars/download-rdu2

@@ -4,6 +4,7 @@ tcp_ports: [80, 443, 873]
 rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"
 nrpe_procs_warn: 900
 nrpe_procs_crit: 1000
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 # nfs mount options, overrides the all/default
 nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=3"

inventory/group_vars/fas

@@ -4,6 +4,8 @@ lvm_size: 30000
 mem_size: 8192
 num_cpus: 4
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 

inventory/group_vars/fas-stg

@@ -4,6 +4,8 @@ lvm_size: 30000
 mem_size: 4096
 num_cpus: 2
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 

inventory/group_vars/gallery-stg

@@ -4,6 +4,8 @@ lvm_size: 50000
 mem_size: 1024
 num_cpus: 2
 
+virt_install_command: "{{ virt_install_command_rhel6 }}"
+
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
 

inventory/group_vars/packages

@@ -6,6 +6,7 @@ num_cpus: 4
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80, 443,
     # This is for glusterd

inventory/group_vars/packages-stg

@@ -6,6 +6,7 @@ num_cpus: 4
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80, 443,
     # These 16 ports are used by fedmsg.  One for each wsgi thread.

inventory/group_vars/paste

@@ -6,6 +6,7 @@ num_cpus: 2
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80, 443, 8888 ]
 # Neeed for rsync from log01 for logs.

inventory/group_vars/paste-stg

@@ -6,6 +6,7 @@ num_cpus: 2
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80, 443, 8888 ]
 # Neeed for rsync from log01 for logs.

inventory/group_vars/wiki

@@ -6,6 +6,7 @@ num_cpus: 4
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80 ]
 fas_client_groups: sysadmin-noc,fi-apprentice

inventory/group_vars/wiki-stg

@@ -6,6 +6,7 @@ num_cpus: 2
 
 # for systems that do not match the above - specify the same parameter in
 # the host_vars/$hostname file
+virt_install_command: "{{ virt_install_command_rhel6 }}"
 
 tcp_ports: [ 80 ]
 fas_client_groups: sysadmin-noc,fi-apprentice

inventory/host_vars/collab03.fedoraproject.org

@@ -1,2 +1,3 @@
 ---
 host_backup_targets: ['/srv']
+virt_install_command: "{{ virt_install_command_rhel6 }}"