From b4a0f1dd8ee621c8f48a4b84708d09ce13e164bc Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 9 Oct 2015 18:14:45 +0000 Subject: [PATCH] Vars for statscache. --- inventory/group_vars/statscache-backend | 16 ++++++ inventory/group_vars/statscache-backend-stg | 13 +++++ inventory/group_vars/statscache-web | 12 ++++ inventory/group_vars/statscache-web-stg | 12 ++++ ...tatscache-backend01.phx2.fedoraproject.org | 14 +++++ ...cache-backend01.stg.phx2.fedoraproject.org | 14 +++++ .../statscache-web01.phx2.fedoraproject.org | 14 +++++ ...tatscache-web01.stg.phx2.fedoraproject.org | 14 +++++ .../statscache-web02.phx2.fedoraproject.org | 14 +++++ ...tatscache-web02.stg.phx2.fedoraproject.org | 14 +++++ inventory/inventory | 22 +++++++ playbooks/groups/statscache.yml | 57 ++++++++++++------- 12 files changed, 196 insertions(+), 20 deletions(-) create mode 100644 inventory/group_vars/statscache-backend create mode 100644 inventory/group_vars/statscache-backend-stg create mode 100644 inventory/group_vars/statscache-web create mode 100644 inventory/group_vars/statscache-web-stg create mode 100644 inventory/host_vars/statscache-backend01.phx2.fedoraproject.org create mode 100644 inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org create mode 100644 inventory/host_vars/statscache-web01.phx2.fedoraproject.org create mode 100644 inventory/host_vars/statscache-web01.stg.phx2.fedoraproject.org create mode 100644 inventory/host_vars/statscache-web02.phx2.fedoraproject.org create mode 100644 inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org diff --git a/inventory/group_vars/statscache-backend b/inventory/group_vars/statscache-backend new file mode 100644 index 0000000000..c76f20f5a6 --- /dev/null +++ b/inventory/group_vars/statscache-backend @@ -0,0 +1,16 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 20000 +mem_size: 6144 +num_cpus: 4 + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file + +# No fedmsg publication... no ports. +tcp_ports: [] + +fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# For performance measurement.. for now. This can be removed whenever. +fedmsg_loglevel: DEBUG diff --git a/inventory/group_vars/statscache-backend-stg b/inventory/group_vars/statscache-backend-stg new file mode 100644 index 0000000000..d15d8f27e7 --- /dev/null +++ b/inventory/group_vars/statscache-backend-stg @@ -0,0 +1,13 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 20000 +mem_size: 1024 +num_cpus: 2 + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file + +# Nope +tcp_ports: [] + +fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/inventory/group_vars/statscache-web b/inventory/group_vars/statscache-web new file mode 100644 index 0000000000..2461d1e1dc --- /dev/null +++ b/inventory/group_vars/statscache-web @@ -0,0 +1,12 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 20000 +mem_size: 1024 +num_cpus: 2 + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file + +tcp_ports: [ 80 ] + +fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/inventory/group_vars/statscache-web-stg b/inventory/group_vars/statscache-web-stg new file mode 100644 index 0000000000..2461d1e1dc --- /dev/null +++ b/inventory/group_vars/statscache-web-stg @@ -0,0 +1,12 @@ +--- +# Define resources for this group of hosts here. +lvm_size: 20000 +mem_size: 1024 +num_cpus: 2 + +# for systems that do not match the above - specify the same parameter in +# the host_vars/$hostname file + +tcp_ports: [ 80 ] + +fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/inventory/host_vars/statscache-backend01.phx2.fedoraproject.org b/inventory/host_vars/statscache-backend01.phx2.fedoraproject.org new file mode 100644 index 0000000000..6e6012f589 --- /dev/null +++ b/inventory/host_vars/statscache-backend01.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.81 + +volgroup: /dev/vg_virthost09 +vmhost: virthost09.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org b/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..26978c5d38 --- /dev/null +++ b/inventory/host_vars/statscache-backend01.stg.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.82 + +volgroup: /dev/vg_virthost16 +vmhost: virthost16.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/host_vars/statscache-web01.phx2.fedoraproject.org b/inventory/host_vars/statscache-web01.phx2.fedoraproject.org new file mode 100644 index 0000000000..0e44cce8a9 --- /dev/null +++ b/inventory/host_vars/statscache-web01.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.31 + +volgroup: /dev/vg_guests +vmhost: virthost02.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/host_vars/statscache-web01.stg.phx2.fedoraproject.org b/inventory/host_vars/statscache-web01.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..76f767afef --- /dev/null +++ b/inventory/host_vars/statscache-web01.stg.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.33 + +volgroup: /dev/vg_virthost16 +vmhost: virthost16.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/host_vars/statscache-web02.phx2.fedoraproject.org b/inventory/host_vars/statscache-web02.phx2.fedoraproject.org new file mode 100644 index 0000000000..a936331e51 --- /dev/null +++ b/inventory/host_vars/statscache-web02.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.32 + +volgroup: /dev/vg_guests +vmhost: virthost19.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org b/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..a761b7c233 --- /dev/null +++ b/inventory/host_vars/statscache-web02.stg.phx2.fedoraproject.org @@ -0,0 +1,14 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.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/ + +eth0_ip: 10.5.126.34 + +volgroup: /dev/vg_guests +vmhost: virthost20.phx2.fedoraproject.org + +datacenter: phx2 diff --git a/inventory/inventory b/inventory/inventory index 535b4f41cc..c11b11b02a 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -622,6 +622,28 @@ ns04.phx2.fedoraproject.org db-qa01.qa.fedoraproject.org proxy10.phx2.fedoraproject.org +[statscache:children] +statscache-web +statscache-backend + +[statscache-stg:children] +statscache-web-stg +statscache-backend-stg + +[statscache-web] +statscache-web01.phx2.fedoraproject.org +statscache-web02.phx2.fedoraproject.org + +[statscache-web-stg] +statscache-web01.stg.phx2.fedoraproject.org +statscache-web02.stg.phx2.fedoraproject.org + +[statscache-backend] +statscache-backend01.phx2.fedoraproject.org + +[statscache-backend-stg] +statscache-backend01.stg.phx2.fedoraproject.org + [summershum] summershum01.phx2.fedoraproject.org diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index 233f5e817d..e94d1e2d70 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -1,14 +1,20 @@ +# create a new notifs-web server +# NOTE: should be used with --limit most of the time +# NOTE: make sure there is room/space for this server on the vmhost +# NOTE: most of these vars_path come from group_vars/notifs-web* or from hostvars + - include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=statscache:statscache-stg" - name: make the box be real hosts: statscache;statscache-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 + handlers: + - include: "{{ handlers }}/restart_services.yml" roles: - base @@ -18,33 +24,44 @@ - hosts - fas_client - collectd/base - - rsyncd - - sudo - - apache - fedmsg/base + - sudo tasks: - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/mod_wsgi.yml" +- name: Stuff just for the web frontend + hosts: statscache-web;statscache-web-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 handlers: - include: "{{ handlers }}/restart_services.yml" -#- name: dole out the service specific config -# hosts: statscache;statscache-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: -# - statscache -# -# handlers: -# - include: "{{ handlers }}/restart_services.yml" + roles: + - apache + - role: openvpn/client + when: env != "staging" + # TODO -- include statscache/frontend here + tasks: + - include: "{{ tasks }}/mod_wsgi.yml" + +- name: Stuff just for the fedmsg backend + hosts: statscache-backend;statscache-backend-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 + handlers: + - include: "{{ handlers }}/restart_services.yml" + + #roles: + # TODO -- include statscache/backend here