moving taskotron-stg and resultsdb-stg to f22, more refactoring for consistency

inventory/group_vars/resultsdb-dev

@@ -20,6 +20,7 @@ extra_enablerepos: ''
 
 # the db_host_machine bits are so that delegation continues to work, even if
 # that db is localhost relative to resultsdb
+#
 resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org
 resultsdb_db_host: "{{ resultsdb_db_host_machine }}"
 resultsdb_db_port: 5432
@@ -33,6 +34,7 @@ resultsdb_secret_key: "{{ dev_resultsdb_secret_key }}"
 allowed_hosts:
     - 10.5.124
 
+
 ############################################################
 # execdb details
 ############################################################

inventory/group_vars/resultsdb-stg

@@ -1,45 +1,57 @@
 ---
-# common items for the releng-* boxes
+############################################################
-lvm_size: 50000
+# general information
-mem_size: 4096
+############################################################
-num_cpus: 4
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
 
+freezes: false
 tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}" ]
-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
 
+external_hostname: taskotron.stg.fedoraproject.org
 deployment_type: stg
 
+# this enables extra repos during dnf install but that's broken right now, remember to re-enable
+# extra_enablerepos: 'infrastructure-testing'
+extra_enablerepos: ''
+
+
+############################################################
+# resultsdb details
+############################################################
+
+# the db_host_machine bits are so that delegation continues to work, even if
+# that db is localhost relative to resultsdb
+
 resultsdb_db_host_machine: db-qa01.qa.fedoraproject.org
 resultsdb_db_host: "{{ resultsdb_db_host_machine }}"
 resultsdb_db_port: 5432
 resultsdb_endpoint: 'resultsdb_api'
 resultsdb_fe_endpoint: 'resultsdb'
 resultsdb_db_name: resultsdb_stg
+resultsdb_db_user: "{{ stg_resultsdb_db_user }}"
+resultsdb_db_password: "{{ stg_resultsdb_db_password }}"
+resultsdb_secret_key: "{{ stg_resultsdb_secret_key }}"
+
+allowed_hosts:
+    - 10.5.124
+
+
+############################################################
+# execdb details
+############################################################
 
 execdb_db_host_machine: db-qa01.qa.fedoraproject.org
 execdb_db_host: "{{ execdb_db_host_machine }}"
 execdb_db_port: 5432
 execdb_endpoint: 'execdb'
 execdb_db_name: execdb_stg
+execdb_db_user: "{{ stg_execdb_db_user }}"
+execdb_db_password: "{{ stg_execdb_db_password }}"
+execdb_secret_key: "{{ stg_execdb_secret_key }}"
 
-external_hostname: taskotron.stg.fedoraproject.org
 
-allowed_hosts:
+############################################################
-    - 10.5.124
+# fedmsg details
-
+############################################################
-freezes: false
 
 fedmsg_certs:
 - service: shell

inventory/group_vars/taskotron-stg-clients

@@ -12,6 +12,10 @@ tcp_ports: [ "{{ buildslave_port }}" ]
 sudoers: "{{ private }}/files/sudo/qavirt-sudoers"
 freezes: false
 
+# this enables extra repos during dnf install but that's broken right now, remember to re-enable
+# extra_enablerepos: 'infrastructure-testing'
+extra_enablerepos: ''
+
 
 ############################################################
 # buildslave config

inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org

@@ -1,16 +1,39 @@
 ---
+############################################################
+# networking
+############################################################
+
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
+eth0_ip: 10.5.124.147
+
+
+############################################################
+# install
+############################################################
+
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
+
 volgroup: /dev/vg_guests
-eth0_ip: 10.5.124.147
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
 
-# default virt install command is for a single nic-device
+
-# define in another group file for more nics (see buildvm)
+############################################################
+# virtual machine
+############################################################
+
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
+
+lvm_size: 50000
+mem_size: 4096
+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

inventory/host_vars/taskotron-dev01.qa.fedoraproject.org

@@ -45,6 +45,7 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
 
 public_hostname: taskotron-dev.fedoraproject.org
 buildmaster: 10.5.124.181
+
 buildslaves:
     - taskotron-client26
     - taskotron-client27

inventory/host_vars/taskotron-stg01.qa.fedoraproject.org

@@ -1,7 +1,17 @@
 ---
+############################################################
+# networking
+############################################################
+
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
+
+
+############################################################
+# install
+############################################################
+
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-21-taskotron-master
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/21/Server/x86_64/os/
 volgroup: /dev/vg_guests
@@ -9,10 +19,19 @@ eth0_ip: 10.5.124.232
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
 fas_client_groups: sysadmin-qa,sysadmin-main
-lvm_size: 45000
 
-# default virt install command is for a single nic-device
+
-# define in another group file for more nics (see buildvm)
+############################################################
+# virtual machine
+############################################################
+
+lvm_size: 45000
+mem_size: 4096
+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
@@ -21,6 +40,11 @@ virt_install_command: /usr/bin/virt-install -n {{ inventory_hostname }} -r {{ me
                   hostname={{ inventory_hostname }}"
                  --network=bridge=br0 --autostart --noautoconsole
 
+
+############################################################
+# taskotron master
+############################################################
+
 public_hostname: taskotron.stg.fedoraproject.org
 buildmaster: 10.5.124.232