Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Drop gallery from stg.

Browse source
This commit is contained in:
Kevin Fenzi 2016-09-16 17:33:56 +00:00
parent f940de2d70
commit a21b3b5448
9 changed files with 0 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

10
inventory/group_vars/gallery
View file

@ -1,10 +0,0 @@
---
lvm_size: 20000
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 ]
fas_client_groups: sysadmin-noc,sysadmin-gallery

13
inventory/group_vars/gallery-stg
View file

@ -1,13 +0,0 @@
---
# Define resources for this group of hosts here.
lvm_size: 50000
mem_size: 1024
num_cpus: 2
virt_install_command: "{{ virt_install_command_rhel6 }}"
# for systems that do not match the above - specify the same parameter in
# the host_vars/$hostname file
tcp_ports: [ 80, 443 ]
fas_client_groups: sysadmin-noc,sysadmin-gallery

10
inventory/host_vars/gallery01.stg.phx2.fedoraproject.org
View file

@ -1,10 +0,0 @@
---
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-6
ks_repo: http://10.5.126.23/repo/rhel/RHEL6-x86_64/
volgroup: /dev/vg_guests
eth0_ip: 10.5.126.70
vmhost: virthost11.phx2.fedoraproject.org
datacenter: phx2

4
inventory/inventory
View file

@ -174,9 +174,6 @@ fedocal02.phx2.fedoraproject.org
[fedocal-stg]
fedocal01.stg.phx2.fedoraproject.org
[gallery-stg]
gallery01.stg.phx2.fedoraproject.org
[github2fedmsg]
github2fedmsg01.phx2.fedoraproject.org
@ -628,7 +625,6 @@ fas3-01.stg.phx2.fedoraproject.org
fedimg01.stg.phx2.fedoraproject.org
fedocal01.stg.phx2.fedoraproject.org
github2fedmsg01.stg.phx2.fedoraproject.org
gallery01.stg.phx2.fedoraproject.org
hotness01.stg.phx2.fedoraproject.org
kerneltest01.stg.phx2.fedoraproject.org
koji01.stg.phx2.fedoraproject.org

1
master.yml
View file

@ -52,7 +52,6 @@
- include: /srv/web/infra/ansible/playbooks/groups/fas.yml
- include: /srv/web/infra/ansible/playbooks/groups/fedimg.yml
- include: /srv/web/infra/ansible/playbooks/groups/fedocal.yml
- include: /srv/web/infra/ansible/playbooks/groups/gallery.yml
- include: /srv/web/infra/ansible/playbooks/groups/github2fedmsg.yml
- include: /srv/web/infra/ansible/playbooks/groups/gnome-backups.yml
- include: /srv/web/infra/ansible/playbooks/groups/hosted.yml

51
playbooks/groups/gallery.yml
View file

@ -1,51 +0,0 @@
# create a new gallery 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/gallery-web* or from hostvars
- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gallery-stg"
- name: make the box be real
hosts: gallery-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
- fedmsg/base
- sudo
- apache
- collectd/base
tasks:
- include: "{{ tasks }}/yumrepos.yml"
- include: "{{ tasks }}/2fa_client.yml"
- include: "{{ tasks }}/motd.yml"
handlers:
- include: "{{ handlers }}/restart_services.yml"
- name: deploy gallery itself
hosts: gallery-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:
- gallery
handlers:
- include: "{{ handlers }}/restart_services.yml"

6
playbooks/include/proxies-reverseproxy.yml
View file

@ -83,12 +83,6 @@
# Talk directly to the app server, not haproxy
proxyurl: http://value01
- role: httpd/reverseproxy
website: apps.fedoraproject.org
destname: gallery
localpath: /gallery
proxyurl: http://localhost:10034
- role: httpd/reverseproxy
website: apps.fedoraproject.org
destname: nuancier

11
roles/gallery/tasks/main.yml
View file

@ -1,11 +0,0 @@
---
# Configuration for the gallery webapp
- name: install needed packages
yum: pkg={{ item }} state=present update_cache=yes
with_items:
- gallery3
- gallery3-openid
- php-gd
tags:
- packages

7
roles/haproxy/templates/haproxy.cfg
View file

@ -213,13 +213,6 @@ listen badges 0.0.0.0:10032
{% endif %}
option httpchk GET /heartbeat
{% if env == "staging" %}
listen gallery
balance hdr(appserver)
server gallery01 gallery01:80 check inter 10s rise 1 fall 2
option httpchk GET /
{% endif %}
listen nuancier 0.0.0.0:10035
balance hdr(appserver)
server nuancier01 nuancier01:80 check inter 10s rise 1 fall 2