making changes for new beaker01.qa

inventory/group_vars/beaker

@@ -1,20 +1,36 @@
 ---
-# common items for the releng-* boxes
 lvm_size: 50000
 mem_size: 4096
 num_cpus: 2
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
 
 tcp_ports: [ 80, 443, 8000 ]
 udp_ports: [ 69 ]
-fas_client_groups: sysadmin-qa
+fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice
 nrpe_procs_warn: 250
 nrpe_procs_crit: 300
 
 freezes: false
 
-virt_install_command: "{{ virt_install_command_rhel6 }}"
+virt_install_command: "{{ virt_install_command_one_nic }}"
+
+# settings for the beaker db, server and lab controller
+beaker_db_host: localhost
+beaker_db_name: beaker
+beaker_db_user: "{{ beaker_db_user }}"
+beaker_db_password: "{{ beaker_db_password }}"
+mariadb_root_password: "{{ beaker_mariadb_root_password }}"
+
+beaker_server_url: "https://beaker.qa.fedoraproject.org"
+beaker_server_cname: "beaker.qa.fedoraproject.org"
+beaker_server_hostname: "beaker01.qa.fedoraproject.org"
+beaker_server_admin_user: "{{ beaker_server_admin_user }}"
+beaker_server_admin_pass: "{{ beaker_server_admin_pass }}"
+beaker_server_email: "sysadmin-qa-members@fedoraproject.org"
+
+beaker_lab_controller_username: "host/beaker01.qa.fedoraproject.org"
+beaker_lab_controller_password: "{{ beaker_lab_controller_password }}"
+
+extra_enablerepos: ''
 
 # These variables are pushed into /etc/system_identification by the base role.
 # Groups and individual hosts should ovveride them with specific info.

inventory/host_vars/beaker01.qa.fedoraproject.org

@@ -2,10 +2,15 @@
 nm: 255.255.255.0
 gw: 10.5.124.254
 dns: 10.5.126.21
-ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-6
+ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7
-ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
+ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/
-volgroup: /dev/vg_guests
+volgroup: /dev/VirtGuests
-eth0_ip: 10.5.124.228
+eth0_ip: 10.5.131.30
 eth0_nm: 255.255.255.128
-vmhost: virthost-comm04.qa.fedoraproject.org
+vmhost: virthost-comm03.qa.fedoraproject.org
 datacenter: phx2
+
+# it'd be nice to have this done automagically but I don't know of a reasonable easy way to do that
+beaker_virthost_signatures:
+  - hostname: 'qa02.qa.fedoraproject.org,10.5.124.152'
+    signature: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxNDurjmSzSyQcCAVLsWk1tgZWWl1TJ05k7j8ob7UqzefpeSrjqsagKsKzv5POrTIjHYv7+pmwbl47IBpkYV9jdJQ1nGPk2+ZAoy3KeTfNcApsYnnwXhoFJRkLymBdrigoqlWsJZdAHjEf5BVSEqb8aIfi4EuTlOQ1Kaoo0CiTs5XPJJAgbI3qv+DBxEdko8VFtmstgkf54u/wSFfI3SiuMW0TXn4cabYyhAwTJ2Es3K9kOtsfukGrvI7kzgxwiXwy8dUBDf1xp+01thfAJxmMx6AGV3WaTrrTPyvQbIVa3XQJfQXh+m6K6YZDoKuXmx4RpY6Q4XhogfvsJrDe1B+b'

master.yml

@@ -27,7 +27,6 @@
 - include: /srv/web/infra/ansible/playbooks/groups/bastion.yml
 - include: /srv/web/infra/ansible/playbooks/groups/batcave.yml
 - include: /srv/web/infra/ansible/playbooks/groups/beaker.yml
-- include: /srv/web/infra/ansible/playbooks/groups/beaker-stg.yml
 - include: /srv/web/infra/ansible/playbooks/groups/beaker-virthosts.yml
 - include: /srv/web/infra/ansible/playbooks/groups/blockerbugs.yml
 - include: /srv/web/infra/ansible/playbooks/groups/bodhi2.yml

playbooks/groups/beaker-stg.yml

@@ -1,54 +0,0 @@
-# create a new beaker server
-# NOTE: make sure there is room/space for this server on the vmhost
-# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars
-
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker-stg"
-
-- name: make the box be real
-  hosts: beaker-stg
-  user: root
-  gather_facts: True
-
-  vars_files: 
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - base
-  - rkhunter
-  - nagios/client
-  - hosts
-  - fas_client
-  - collectd/base
-  - sudo
-  - apache
-
-  tasks:
-  # this is how you include other task lists
-  - include: "{{ tasks }}/yumrepos.yml"
-  - include: "{{ tasks }}/2fa_client.yml"
-  - include: "{{ tasks }}/motd.yml"
-
-  handlers:
-  - include: "{{ handlers }}/restart_services.yml"
-
-- name: configure beaker and required services
-  hosts: beaker-stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-   - { role: mariadb_server, tags: ['mariadb'] }
-   - { role: beaker/base, tags: ['beakerbase'] }
-   - { role: beaker/labcontroller, tags: ['beakerlabcontroller'] }
-   - { role: beaker/server, tags: ['beakerserver'] }
-
-  handlers:
-   - include: "{{ handlers }}/restart_services.yml"
-

playbooks/groups/beaker.yml

@@ -2,10 +2,10 @@
 # NOTE: make sure there is room/space for this server on the vmhost
 # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars
 
-- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker"
+- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg"
 
 - name: make the box be real
-  hosts: beaker
+  hosts: beaker:beaker-stg
   user: root
   gather_facts: True
 
@@ -22,6 +22,7 @@
   - fas_client
   - collectd/base
   - sudo
+  - apache
 
   tasks:
   # this is how you include other task lists
@@ -31,3 +32,23 @@
 
   handlers:
   - include: "{{ handlers }}/restart_services.yml"
+
+- name: configure beaker and required services
+  hosts: beaker:beaker-stg
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "/srv/private/ansible/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+   - { role: mariadb_server, tags: ['mariadb'] }
+   - { role: beaker/base, tags: ['beakerbase'] }
+   - { role: beaker/labcontroller, tags: ['beakerlabcontroller'] }
+   - { role: beaker/server, tags: ['beakerserver'] }
+
+  handlers:
+   - include: "{{ handlers }}/restart_services.yml"
+