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

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-06-20 17:46:32 +00:00
commit b132a7c1ca
11 changed files with 23 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/sundries
View file

@ -8,7 +8,7 @@ num_cpus: 2
# the host_vars/$hostname file
tcp_ports: [ 80, 873 ]
fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran
fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran,sysadmin-releng
# This gets overridden by whichever node we want to run special cronjobs.
master_sundries_node: False

2
inventory/group_vars/sundries-stg
View file

@ -8,7 +8,7 @@ num_cpus: 2
# the host_vars/$hostname file
tcp_ports: [ 80, 873 ]
fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran
fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran,sysadmin-releng
# This gets overridden by whichever node we want to run special cronjobs.
master_sundries_node: False

4
inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org
View file

@ -13,8 +13,8 @@ eth0_nm: 255.255.255.128
# install
############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/
volgroup: /dev/vg_guests
vmhost: virthost-comm04.qa.fedoraproject.org

6
inventory/host_vars/taskotron-dev01.qa.fedoraproject.org
View file

@ -12,8 +12,8 @@ eth0_ip: 10.5.124.181
# install
############################################################
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-24-taskotron-master
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/24/Server/x86_64/os/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-25-taskotron-master
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/25/Server/x86_64/os/
volgroup: /dev/vg_guests
vmhost: virthost-comm04.qa.fedoraproject.org
datacenter: phx2
@ -24,7 +24,7 @@ fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin
# virtual machine
############################################################
lvm_size: 95000
lvm_size: 60000
mem_size: 4096
num_cpus: 4

1
playbooks/groups/taskotron.yml
View file

@ -49,6 +49,7 @@
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
roles:
- { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_dev', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'dev' }
- { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_stg', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'stg' }
- { role: nfs/client, mnt_dir: '/srv/taskotron/', nfs_src_dir: 'fedora_taskotron_prod', nfs_mount_opts: 'rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4', when: deployment_type == 'prod' }
- { role: taskotron/grokmirror, tags: ['grokmirror'] }

2
playbooks/manual/upgrade/fmn.yml
View file

@ -15,7 +15,7 @@
command: yum clean all {%if testing%} --enablerepo=infrastructure-testing {%endif%}
check_mode: no
- name: yum update FMN packages from main repo
yum: name="python-fmn*" state=latest
yum: name="python-fmn" state=latest
when: not testing
- name: yum update FMN packages from testing repo
yum: pkg=python-fmn state=latest enablerepo=infrastructure-testing

26
roles/notifs/frontend/tasks/main.yml
View file

@ -4,9 +4,7 @@
- name: install needed packages
yum: pkg={{ item }} state=present
with_items:
- python-fmn-web
- python-fmn-lib
- python-fmn-rules
- python-fmn
- python-psycopg2
- libsemanage-python
- python-memcached
@ -58,22 +56,11 @@
- notifs
- notifs/frontend
- name: setup symlink to fedora theme
file: >
src=/usr/share/fmn.web/static/bootstrap-3.3.4-fedora
dest=/usr/share/fmn.web/static/bootstrap
state=link
when: env != "staging"
tags:
- notifs
- notifs/frontend
- name: setup symlink to fedora theme
file: >
src=/usr/share/fmn/static/bootstrap-3.3.4-fedora
dest=/usr/share/fmn/static/bootstrap
state=link
when: env == "staging"
tags:
- notifs
- notifs/frontend
@ -88,17 +75,8 @@
- notifs
- notifs/frontend
- name: copy custom wsgi file
copy: src=fmn.web.wsgi dest=/usr/share/fmn.web/fmn.web.wsgi mode=0644
notify:
- restart apache
tags:
- notifs
- notifs/frontend
- name: copy custom wsgi file
copy: src=fmn.web.wsgi dest=/usr/share/fmn/fmn.web.wsgi mode=0644
when: env == "staging"
notify:
- restart apache
tags:
@ -132,7 +110,7 @@
- name: apply selinux type to static files
file: >
dest=/usr/share/fmn.web/static
dest=/usr/share/fmn/static
setype=httpd_sys_content_t
state=directory
recurse=yes

8
roles/notifs/frontend/templates/fmn.web.conf
View file

@ -1,8 +1,4 @@
{% if env == 'staging' %}
Alias /notifications/static /usr/share/fmn/static
{% else %}
Alias /notifications/static /usr/share/fmn.web/static
{% endif %}
WSGIDaemonProcess fmn user=apache group=apache maximum-requests=1000 display-name=fmn processes={{ wsgi_procs }} threads={{ wsgi_threads }}
WSGISocketPrefix run/wsgi
@ -10,11 +6,7 @@ WSGIRestrictStdout On
WSGIRestrictSignal Off
WSGIPythonOptimize 1
{% if env == 'staging' %}
WSGIScriptAlias /notifications /usr/share/fmn/fmn.web.wsgi
{% else %}
WSGIScriptAlias /notifications /usr/share/fmn.web/fmn.web.wsgi
{% endif %}
<Location /notifications>
WSGIProcessGroup fmn

7
roles/osbs-client/files/README Normal file
View file

@ -0,0 +1,7 @@
The site-customize file here additionally disables or enables plugins on top of
the default set.
The default set ships with osbs-client and can be found here:
https://github.com/projectatomic/osbs-client/blob/master/inputs/prod_inner.json
See also: https://github.com/projectatomic/osbs-client/blob/master/docs/build_process.md

2
roles/osbs-client/tasks/main.yml
View file

@ -12,6 +12,8 @@
path: "/etc/osbs/input/"
state: directory
# This overrides defaults which are set in
# https://github.com/projectatomic/osbs-client/blob/master/inputs/prod_inner.json
- name: Upload OSBS Site Customizations plugin conf
copy:
src: "osbs-site-customize.json"

6
roles/regcfp/templates/config.json
View file

@ -57,16 +57,16 @@
},
"permissions": {
"admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "duffy@fedoraproject.org", "robyduck@fedoraproject.org", "mattdm@fedoraproject.org", "bex@fedoraproject.org", "nb@fedoraproject.org", "mitzie@fedoraproject.org"],
"admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "duffy@fedoraproject.org", "robyduck@fedoraproject.org", "mattdm@fedoraproject.org", "bex@fedoraproject.org", "nb@fedoraproject.org", "mitzie@fedoraproject.org", "cprofitt@fedoraproject.org"],
"papers": {
"submit": ["*authenticated*"],
"submit": [],
"list": {
"accepted": ["bex@fedoraproject.org", "duffy@fedoraproject.org", "pfrields@fedoraproject.org", "mitzie@fedoraproject.org"],
"own": ["*authenticated*"],
"all": ["pfrields@fedoraproject.org", "duffy@fedoraproject.org", "mattdm@fedoraproject.org", "robyduck@fedoraproject.org", "bex@fedoraproject.org", "cprofitt@fedoraproject.org", "nb@fedoraproject.org", "mitzie@fedoraproject.org"]
},
"edit": {
"own": ["*authenticated*"],
"own": [],
"all": ["pfrields@fedoraproject.org", "bex@fedoraproject.org", "duffy@fedoraproject.org"]
},
"delete": {