refactoring taskotron dev to be more conformant, work with new roles

4 files changed, 143 insertions, 54 deletions

diff --git a/inventory/group_vars/resultsdb-dev b/inventory/group_vars/resultsdb-dev
index d4de8037d..950f75166 100644
--- a/inventory/group_vars/resultsdb-dev
+++ b/inventory/group_vars/resultsdb-dev
@@ -1,23 +1,22 @@
 ---
-# common items for the releng-* boxes
-lvm_size: 50000
-mem_size: 4096
-num_cpus: 4
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
+############################################################
+# general information
+############################################################
 
+freezes: false
 tcp_ports: [ 80, 443, "{{ resultsdb_db_port }}", "{{ execdb_db_port }}" ]
-fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
-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-dev.fedoraproject.org
+deployment_type: dev
+
+# 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
@@ -30,6 +29,13 @@ resultsdb_db_name: resultsdb_dev
 resultsdb_db_user: "{{ dev_resultsdb_db_user }}"
 resultsdb_db_password: "{{ dev_resultsdb_db_password }}"
 
+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
@@ -38,13 +44,4 @@ execdb_db_name: execdb_dev
 execdb_db_user: "{{ dev_execdb_db_user }}"
 execdb_db_password: "{{ dev_execdb_db_password }}"
 
-external_hostname: taskotron-dev.fedoraproject.org
-
-allowed_hosts:
-    - 10.5.124
 
-# this enables extra repos during dnf install but that's broken right now, remember to re-enable
-# extra_enablerepos: 'infrastructure-testing'
-extra_enablerepos: ''
-
-freezes: false
diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev
index 45a4cc031..14cc3c56e 100644
--- a/inventory/group_vars/taskotron-dev
+++ b/inventory/group_vars/taskotron-dev
@@ -1,5 +1,24 @@
 ---
+############################################################
+# general information
+############################################################
+
 fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
+tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
+freezes: false
+
+external_hostname: taskotron-dev.fedoraproject.org
+deployment_type: dev
+robots_path: /var/www/html
+
+# this enables extra repos during dnf install but that's broken right now, remember to re-enable
+# extra_enablerepos: 'infrastructure-testing'
+extra_enablerepos: ''
+
+
+############################################################
+# task repo details
+############################################################
 
 grokmirror_basedir: /var/lib/git/mirror
 grokmirror_user: grokmirror
@@ -9,8 +28,38 @@ grokmirror_repos:
   - { name: fedoraqa/examplelong, url: 'https://bitbucket.org/fedoraqa/task-examplelong.git'}
   - { name: fedoraqa/examplebodhi, url: 'https://bitbucket.org/fedoraqa/task-examplebodhi.git'}
   - { name: fedoraqa/upgradepath, url: 'https://bitbucket.org/fedoraqa/task-upgradepath.git'}
-buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqNpJlS14KKQQ8gAaXo0untJRccLJSrdUt/hWlpZ9Oad5KKYoRNznsGK3j9WCO4YDFXKGGxBrpqdyegPLO4J9zHmtlUPNfM4kbXVlVtIMGGKmBi9rQPNRpeclUpsjlo3uF9IqIIUSS1IMcx1X1oz60kmrAWO9+Z7mYs/AuCCeomlET3OU7paQYxL5Dgs2n6/IjhvoCitN9T9bBf91nLuRh+EtEbBL5ztZ1kVJxj5oTQN7iGKw2V0tW0MJ1WtnK2/j4v9MivnZPSPPKDysveNze2Vy9kioQACvrvjyHMIQrc+2YS/38D/fv7e4WhhuoOGT5Tip20PPspiCQRiSUBDN1 buildslave@taskotron-stg.fedoraproject.org'
+
+
+############################################################
+# urls and endpoints
+############################################################
+
+execdb_endpoint: execdb
+execdb_statuspush: http://resultsdb-dev01.qa.fedoraproject.org/execdb/buildbottest
+execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb
+resultsdb_api_endpoint: resultsdb_api
+resultsdb_host: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/
+resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/
+resultsdb_fe_endpoint: resultsdb
+resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/
+resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
+taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
+
+
+############################################################
+# taskotron details
+############################################################
+
 settings_dir: /etc/taskotron
+landingpage_title: "Taskotron Development"
+public_artifacts_dir: /srv/taskotron/artifacts
+
+
+############################################################
+# buildbot details
+############################################################
+
+buildslave_ssh_pubkey: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDqNpJlS14KKQQ8gAaXo0untJRccLJSrdUt/hWlpZ9Oad5KKYoRNznsGK3j9WCO4YDFXKGGxBrpqdyegPLO4J9zHmtlUPNfM4kbXVlVtIMGGKmBi9rQPNRpeclUpsjlo3uF9IqIIUSS1IMcx1X1oz60kmrAWO9+Z7mYs/AuCCeomlET3OU7paQYxL5Dgs2n6/IjhvoCitN9T9bBf91nLuRh+EtEbBL5ztZ1kVJxj5oTQN7iGKw2V0tW0MJ1WtnK2/j4v9MivnZPSPPKDysveNze2Vy9kioQACvrvjyHMIQrc+2YS/38D/fv7e4WhhuoOGT5Tip20PPspiCQRiSUBDN1 buildslave@taskotron-stg.fedoraproject.org'
 buildmaster_db_host: db-qa01.qa.fedoraproject.org
 buildmaster_db_name: buildmaster_dev
 buildmaster_template: taskotron.master.cfg.j2
@@ -22,24 +71,13 @@ buildmaster_dir: /home/buildmaster/master
 buildslave_dir: /home/buildslave/slave
 master_dir: /home/buildmaster/master
 master_user: buildmaster
-external_hostname: taskotron-dev.fedoraproject.org
-execdb_server: http://resultsdb-dev01.qa.fedoraproject.org/execdb
-execdb_statuspush: http://resultsdb-dev01.qa.fedoraproject.org/execdb/buildbottest
-execdb_endpoint: execdb
-resultsdb_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/api/v1.0
-resultsdb_host: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb_api/
-resultsdb_frontend_url: http://resultsdb-dev01.qa.fedoraproject.org/resultsdb/
-resultsdb_external_url: https://taskotron-dev.fedoraproject.org/resultsdb/
-resultsdb_fe_endpoint: resultsdb
-resultsdb_api_endpoint: resultsdb_api
-landingpage_title: "Taskotron Development"
-deployment_type: dev
-tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
+
+
+############################################################
+# fakefedorainfra stuff (shouldn't need this anymore)
+############################################################
+
 fakefedorainfra_db_host: db-qa01.qa.fedoraproject.org
 fakefedorainfra_db_name: dev_fakefedorainfra
 fakefedorainfra_endpoint: fakefedorainfra
 fakefedorainfra_url: https://taskotron-dev.fedoraproject.org/fakefedorainfra
-taskotron_docs_url: https://docs.qadevel.cloud.fedoraproject.org/libtaskotron/latest/
-freezes: false
-public_artifacts_dir: /srv/taskotron/artifacts
-robots_path: /var/www/html
diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
index b445c5a19..5f8d20914 100644
--- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
@@ -1,12 +1,44 @@
 ---
+############################################################
+# networking
+############################################################
+
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
+eth0_ip: 10.5.124.205
+
+
+############################################################
+# install
+############################################################
+
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
+
 volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.205
 vmhost: virthost-comm02.qa.fedoraproject.org
 datacenter: phx2
 
-deployment_type: dev
+
+############################################################
+# 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/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
+
diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
index e645c88a5..38189b3fe 100644
--- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
+++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
@@ -1,25 +1,47 @@
 ---
+############################################################
+# networking
+############################################################
+
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
+eth0_ip: 10.5.124.181
+
+############################################################
+# install
+############################################################
+
 ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-22-taskotron-master
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/22/Server/x86_64/os/
 volgroup: /dev/vg_guests
-eth0_ip: 10.5.124.181
 vmhost: virthost-comm04.qa.fedoraproject.org
 datacenter: phx2
+
+############################################################
+# virtual machine
+############################################################
+
 fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
+
 lvm_size: 45000
+mem_size: 4096
+num_cpus: 4
 
-# 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 }}
+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
-                 "ks={{ ks_url }} ip={{ eth0_ip }} netmask={{ nm }}
-                  gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
-                  hostname={{ inventory_hostname }}"
-                 --network=bridge=br0 --autostart --noautoconsole
+                 "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
+
+############################################################
+# taskotron master
+############################################################
 
 public_hostname: taskotron-dev.fedoraproject.org
 buildmaster: 10.5.124.181