diff --git a/inventory/group_vars/all b/inventory/group_vars/all index a38b0a6113..a8002e7fec 100644 --- a/inventory/group_vars/all +++ b/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 diff --git a/inventory/group_vars/ask b/inventory/group_vars/ask index f642aa7c78..ceb4790bf2 100644 --- a/inventory/group_vars/ask +++ b/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 diff --git a/inventory/group_vars/ask-stg b/inventory/group_vars/ask-stg index ff0706e86a..ceb4790bf2 100644 --- a/inventory/group_vars/ask-stg +++ b/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 diff --git a/inventory/group_vars/beaker b/inventory/group_vars/beaker index e0c32b10f4..bcd4ae8578 100644 --- a/inventory/group_vars/beaker +++ b/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/ diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker-stg index a246bd35a0..a7a9109079 100644 --- a/inventory/group_vars/beaker-stg +++ b/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 diff --git a/inventory/group_vars/docs-backend b/inventory/group_vars/docs-backend index f88ab38a4c..030891687c 100644 --- a/inventory/group_vars/docs-backend +++ b/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 diff --git a/inventory/group_vars/download-rdu2 b/inventory/group_vars/download-rdu2 index 7a7f06d5a6..6e42c2bcda 100644 --- a/inventory/group_vars/download-rdu2 +++ b/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" diff --git a/inventory/group_vars/fas b/inventory/group_vars/fas index 285bceed5c..b2a6526708 100644 --- a/inventory/group_vars/fas +++ b/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 diff --git a/inventory/group_vars/fas-stg b/inventory/group_vars/fas-stg index 4660fee1a5..1f86e8eea3 100644 --- a/inventory/group_vars/fas-stg +++ b/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 diff --git a/inventory/group_vars/gallery-stg b/inventory/group_vars/gallery-stg index cf68892be2..ecda28b690 100644 --- a/inventory/group_vars/gallery-stg +++ b/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 diff --git a/inventory/group_vars/packages b/inventory/group_vars/packages index b6addbd95d..55ba4ed74a 100644 --- a/inventory/group_vars/packages +++ b/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 diff --git a/inventory/group_vars/packages-stg b/inventory/group_vars/packages-stg index 33abe59896..d6b8e9940d 100644 --- a/inventory/group_vars/packages-stg +++ b/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. diff --git a/inventory/group_vars/paste b/inventory/group_vars/paste index a336a39ca0..5165627096 100644 --- a/inventory/group_vars/paste +++ b/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. diff --git a/inventory/group_vars/paste-stg b/inventory/group_vars/paste-stg index a336a39ca0..5165627096 100644 --- a/inventory/group_vars/paste-stg +++ b/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. diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index ccce69a810..4ed43ec3d6 100644 --- a/inventory/group_vars/wiki +++ b/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 diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki-stg index eb19f6f95c..24009a53f0 100644 --- a/inventory/group_vars/wiki-stg +++ b/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 diff --git a/inventory/host_vars/collab03.fedoraproject.org b/inventory/host_vars/collab03.fedoraproject.org index fbc0826155..cf97b5151a 100644 --- a/inventory/host_vars/collab03.fedoraproject.org +++ b/inventory/host_vars/collab03.fedoraproject.org @@ -1,2 +1,3 @@ --- host_backup_targets: ['/srv'] +virt_install_command: "{{ virt_install_command_rhel6 }}"