From 0355af8581808d24da2092a068e04d2ecee6c678 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Fri, 8 May 2015 20:29:53 +0000 Subject: [PATCH] creating beaker-stg01.qa for beaker staging env --- inventory/group_vars/beaker-stg | 12 +++++ .../beaker-stg01.qa.fedoraproject.org | 12 +++++ inventory/inventory | 3 ++ playbooks/groups/beaker-stg.yml | 49 +++++++++++++++++++ playbooks/include/proxies-reverseproxy.yml | 9 ++++ 5 files changed, 85 insertions(+) create mode 100644 inventory/group_vars/beaker-stg create mode 100644 inventory/host_vars/beaker-stg01.qa.fedoraproject.org create mode 100644 playbooks/groups/beaker-stg.yml diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker-stg new file mode 100644 index 0000000000..ac079a4c17 --- /dev/null +++ b/inventory/group_vars/beaker-stg @@ -0,0 +1,12 @@ +--- +lvm_size: 50000 +mem_size: 4096 +num_cpus: 2 + +tcp_ports: [ 80, 443, 8000 ] +udp_ports: [ 69 ] +fas_client_groups: sysadmin-qa +nrpe_procs_warn: 250 +nrpe_procs_crit: 300 + +freezes: false diff --git a/inventory/host_vars/beaker-stg01.qa.fedoraproject.org b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org new file mode 100644 index 0000000000..694c6bbbe7 --- /dev/null +++ b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org @@ -0,0 +1,12 @@ +--- +nm: 255.255.255.0 +gw: 10.5.124.254 +dns: 10.5.124.21 +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ +volgroup: /dev/vg_guests +eth0_ip: 10.5.124.141 +vmhost: virthost-comm04.qa.fedoraproject.org +datacenter: phx2 +fas_client_groups: sysadmin-qa,sysadmin-main + diff --git a/inventory/inventory b/inventory/inventory index bc9e149c60..21f2adcc54 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -7,6 +7,9 @@ [beaker] beaker01.qa.fedoraproject.org +[beaker-stg] +beaker-stg01.qa.fedoraproject.org + [beaker-virthosts] qa02.qa.fedoraproject.org qa08.qa.fedoraproject.org diff --git a/playbooks/groups/beaker-stg.yml b/playbooks/groups/beaker-stg.yml new file mode 100644 index 0000000000..adcca848b2 --- /dev/null +++ b/playbooks/groups/beaker-stg.yml @@ -0,0 +1,49 @@ +# 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 + +- name: make beaker server + hosts: beaker-stg + user: root + gather_facts: False + + vars_files: + - /srv/web/infra/ansible/vars/global.yml + - "/srv/private/ansible/vars.yml" + - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml + + tasks: + - include: "{{ tasks }}/virt_instance_create.yml" + + handlers: + - include: "{{ handlers }}/restart_services.yml" + +- 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 + - denyhosts + - 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" diff --git a/playbooks/include/proxies-reverseproxy.yml b/playbooks/include/proxies-reverseproxy.yml index a58d55a39d..7d54bdc62a 100644 --- a/playbooks/include/proxies-reverseproxy.yml +++ b/playbooks/include/proxies-reverseproxy.yml @@ -367,6 +367,15 @@ proxyurl: http://resultsdb-stg01.qa.fedoraproject.org when: env == "staging" + ### Beaker staging + - role: httpd/reverseproxy + website: beaker.stg.fedoraproject.org + destname: beaker-stg + # Talk directly to the app server, not haproxy + proxyurl: http://beaker-stg01.qa.fedoraproject.org + when: env == "staging" + + # This one gets its own role (instead of httpd/reverseproxy) so that it can # copy in some silly static resources (globe.png, index.html) - role: geoip-city-wsgi/proxy