Another pile of trailing whitespace fixes
This commit is contained in:
parent
04a52b8667
commit
1c6e9a11f4
24 changed files with 79 additions and 79 deletions
|
@ -60,7 +60,7 @@
|
|||
- name: Remove unwanted files
|
||||
file: dest=/etc/fedmsg.d/{{item}} state=absent
|
||||
with_items:
|
||||
- endpoints.py
|
||||
- endpoints.py
|
||||
tags:
|
||||
- config
|
||||
- fedmsgdconfig
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
tags:
|
||||
- beaker_lab_controller
|
||||
|
||||
- name: start required services
|
||||
- name: start required services
|
||||
service: name={{ item }} state=started enabled=yes
|
||||
with_items:
|
||||
- httpd
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# This is a beaker_server role.
|
||||
# This is a beaker_server role.
|
||||
#
|
||||
---
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
- packages
|
||||
when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7
|
||||
|
||||
# install libvirtd.conf
|
||||
# install libvirtd.conf
|
||||
#
|
||||
# This provides us with the ability to control VMs with non-root and
|
||||
# non-fas accounts
|
||||
|
@ -34,7 +34,7 @@
|
|||
service: name=libvirtd state=started enabled=yes
|
||||
|
||||
#
|
||||
# Disable lvmetad as it causes lots of problems with iscsi shared lvm and caching.
|
||||
# Disable lvmetad as it causes lots of problems with iscsi shared lvm and caching.
|
||||
#
|
||||
- name: disable lvmetad
|
||||
lineinfile: dest=/etc/lvm/lvm.conf regexp="^ use_lvmetad = 1" line=" use_lvmetad = 0" backrefs=yes
|
||||
|
|
|
@ -74,7 +74,7 @@
|
|||
tags:
|
||||
- bodhi
|
||||
- config
|
||||
|
||||
|
||||
- name: setup /etc/bodhi/mash.conf file...
|
||||
template: >
|
||||
src=mash.conf
|
||||
|
@ -157,7 +157,7 @@
|
|||
- bodhi
|
||||
|
||||
- name: sync packages from pkgdb2 to koji (el5)
|
||||
cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root"
|
||||
cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root"
|
||||
job="/usr/local/bin/owner-sync-pkgdb dist-5E-epel"
|
||||
cron_file=update-koji-owner-EL-5
|
||||
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
|
||||
|
@ -165,23 +165,23 @@
|
|||
- bodhi
|
||||
|
||||
- name: sync packages from pkgdb2 to koji (el6)
|
||||
cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root"
|
||||
cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root"
|
||||
job="/usr/local/bin/owner-sync-pkgdb dist-6E-epel"
|
||||
cron_file=update-koji-owner-EL-6
|
||||
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
|
||||
tags:
|
||||
- bodhi
|
||||
|
||||
|
||||
- name: sync packages from pkgdb2 to koji (epel7)
|
||||
cron: name="owner-sync-epel7" minute="7,17,27,37,47,57" user="root"
|
||||
cron: name="owner-sync-epel7" minute="7,17,27,37,47,57" user="root"
|
||||
job="/usr/local/bin/owner-sync-pkgdb epel7"
|
||||
cron_file=update-koji-owner-epel7
|
||||
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
|
||||
tags:
|
||||
- bodhi
|
||||
|
||||
|
||||
- name: sync packages from pkgdb2 to koji fedora
|
||||
cron: name="owner-sync-fedora" minute="7,17,27,37,47,57" user="root"
|
||||
cron: name="owner-sync-fedora" minute="7,17,27,37,47,57" user="root"
|
||||
job="/usr/local/bin/owner-sync-pkgdb f23;/usr/local/bin/owner-sync-pkgdb f24;/usr/local/bin/owner-sync-pkgdb f25;/usr/local/bin/owner-sync-pkgdb f26"
|
||||
cron_file=update-koji-owner-fedora
|
||||
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
|
||||
|
@ -223,7 +223,7 @@
|
|||
- bodhi
|
||||
- cron
|
||||
|
||||
- name: Updates sync cron job.
|
||||
- name: Updates sync cron job.
|
||||
cron: name="updates-sync" minute="15,45" user="ftpsync"
|
||||
job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-fedora.lock -t /pub fedora'"
|
||||
cron_file=updates-sync
|
||||
|
@ -233,7 +233,7 @@
|
|||
- bodhi
|
||||
- cron
|
||||
|
||||
- name: epel Updates sync cron job.
|
||||
- name: epel Updates sync cron job.
|
||||
cron: name="epel-updates-sync" minute="15,45" user="ftpsync"
|
||||
job="/usr/local/bin/lock-wrapper fedora-epel-push '/usr/local/bin/fedora-epel-push && /usr/local/bin/update-fullfiletimelist -l /tmp/update-fullfiletimelist-epel.lock -t /pub epel'"
|
||||
cron_file=updates-sync
|
||||
|
@ -243,7 +243,7 @@
|
|||
- bodhi
|
||||
- cron
|
||||
|
||||
- name: directory sizes update cron job.
|
||||
- name: directory sizes update cron job.
|
||||
cron: name="directory-sizes-update" minute="30" hour="19" user="ftpsync"
|
||||
job="/usr/bin/find /pub/alt/ /pub/archive/ /pub/fedora-secondary/ /pub/fedora/ /pub/epel/ -type d ! -path '/pub/alt/screenshots/f21/source' | grep -v snapshot | /usr/bin/xargs -n 1 /usr/bin/du --exclude=.snapshot -sh > /tmp/DIRECTORY_SIZES.txt 2> /dev/null; cp /tmp/DIRECTORY_SIZES.txt /pub/"
|
||||
cron_file=directory-sizes-update
|
||||
|
|
|
@ -31,11 +31,11 @@
|
|||
- bodhi
|
||||
|
||||
- name: setup basic /etc/bodhi/ contents (staging)
|
||||
template: >
|
||||
src="staging.ini.j2"
|
||||
dest="/etc/bodhi/production.ini"
|
||||
owner=bodhi
|
||||
group=bodhi
|
||||
template: >
|
||||
src="staging.ini.j2"
|
||||
dest="/etc/bodhi/production.ini"
|
||||
owner=bodhi
|
||||
group=bodhi
|
||||
mode=0600
|
||||
when: inventory_hostname.startswith('bodhi0') and env == 'staging'
|
||||
notify:
|
||||
|
@ -45,11 +45,11 @@
|
|||
- bodhi
|
||||
|
||||
- name: setup basic /etc/bodhi/ contents (production)
|
||||
template: >
|
||||
src="production.ini.j2"
|
||||
dest="/etc/bodhi/production.ini"
|
||||
owner=bodhi
|
||||
group=bodhi
|
||||
template: >
|
||||
src="production.ini.j2"
|
||||
dest="/etc/bodhi/production.ini"
|
||||
owner=bodhi
|
||||
group=bodhi
|
||||
mode=0600
|
||||
when: inventory_hostname.startswith('bodhi0') and env == 'production'
|
||||
notify:
|
||||
|
@ -79,7 +79,7 @@
|
|||
|
||||
- name: setup basic /etc/httpd/conf.d/ bodhi contents
|
||||
template: >
|
||||
src="bodhi-app.conf"
|
||||
src="bodhi-app.conf"
|
||||
dest="/etc/httpd/conf.d/bodhi.conf"
|
||||
owner=root
|
||||
group=root
|
||||
|
@ -154,14 +154,14 @@
|
|||
# - bodhi
|
||||
# - selinux
|
||||
|
||||
- name: enable httpd_tmp_exec SELinux boolean
|
||||
- name: enable httpd_tmp_exec SELinux boolean
|
||||
seboolean: name=httpd_tmp_exec state=yes persistent=yes
|
||||
tags:
|
||||
- config
|
||||
- bodhi
|
||||
- selinux
|
||||
|
||||
- name: enable httpd_can_network_connect_db SELinux boolean
|
||||
- name: enable httpd_can_network_connect_db SELinux boolean
|
||||
seboolean: name=httpd_can_network_connect_db state=yes persistent=yes
|
||||
tags:
|
||||
- config
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
file: dest=/usr/share/cgit/images state=directory owner=root group=root mode=0755
|
||||
tags: cgit
|
||||
|
||||
- name: Copy cgit them into place.
|
||||
- name: Copy cgit them into place.
|
||||
copy: src={{item}} dest=/usr/share/cgit/{{item}} owner=root group=root mode=0644
|
||||
with_items:
|
||||
- cgit.css
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
when: inventory_hostname.startswith('people')
|
||||
|
||||
#
|
||||
# For the batcave we just have a small static list
|
||||
# For the batcave we just have a small static list
|
||||
#
|
||||
- name: install the file for batcave
|
||||
copy: src=cgit-projects-batcave dest=/etc/cgit-projects-batcave mode=0644
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
---
|
||||
# collectd client setup
|
||||
# collectd client setup
|
||||
|
||||
# install pkg
|
||||
- name: install collectd
|
||||
|
@ -152,17 +152,17 @@
|
|||
- selinux
|
||||
|
||||
|
||||
|
||||
|
||||
# each of the below should move to a separate task list
|
||||
# since they are odd-balls and one-offs
|
||||
|
||||
# fedmsg - busgateway## only
|
||||
# add /usr/share/collectd/fedmsg-types.db
|
||||
|
||||
|
||||
# memcached - memcached only
|
||||
|
||||
# postgres - this is a conn check
|
||||
## add /usr/share/collectd/pgconn-types.db
|
||||
## add /usr/share/collectd/pgconn-types.db
|
||||
|
||||
# openvpn - for bastion/openvpn gateways only
|
||||
|
||||
|
@ -172,8 +172,8 @@
|
|||
# haproxy
|
||||
## add /usr/share/collectd/haproxy-types.db
|
||||
## add socat pkg
|
||||
##
|
||||
##
|
||||
|
||||
# webproxy
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
---
|
||||
# collectd server setup
|
||||
# collectd server setup
|
||||
|
||||
# install pkg
|
||||
- name: install collectd server packages
|
||||
yum: name={{ item }} state=present
|
||||
with_items:
|
||||
with_items:
|
||||
- collectd-rrdtool
|
||||
- collectd-ping
|
||||
- collectd-web
|
||||
|
@ -40,6 +40,6 @@
|
|||
# install upgrade target
|
||||
- name: install collect upgrade target to handle v4 clients
|
||||
copy: src=vfive-upgrade.conf dest=/etc/collectd.d/vfive-upgrade.conf
|
||||
tags:
|
||||
tags:
|
||||
- config
|
||||
- collectd/server
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
gather_facts: True
|
||||
vars:
|
||||
- files: files/
|
||||
|
||||
|
||||
tasks:
|
||||
- name: edit hostname to be instance name
|
||||
shell: hostname `curl -s http://169.254.169.254/2009-04-04/meta-data/instance-id`
|
||||
|
@ -74,7 +74,7 @@
|
|||
|
||||
#- yum: name=mock enablerepo=epel-testing state=latest
|
||||
|
||||
- name: mockbuilder user
|
||||
- name: mockbuilder user
|
||||
user: name=mockbuilder groups=mock
|
||||
|
||||
- name: mockbuilder .ssh
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
tasks:
|
||||
- name: generate builder name
|
||||
local_action: set_fact vm_name="Copr_builder_{{ 999999999 | random }}"
|
||||
|
||||
|
||||
- debug: msg="vm_name={{ vm_name }}"
|
||||
- include: "spinup_nova_task.yml"
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
|||
|
||||
- name: wait for he host to be hot
|
||||
local_action: wait_for host={{ builder_ip }} port=22 delay=1 timeout=600
|
||||
|
||||
|
||||
- name: wait until ssh is available
|
||||
local_action: shell false; until [ "$?" -eq "0" ]; do sleep 2; ssh -o PasswordAuthentication=no {{ spawning_vm_user|default('fedora') }}@{{ builder_ip }} 'echo foobar' 2>/dev/null; done
|
||||
async: 600
|
||||
|
@ -34,7 +34,7 @@
|
|||
hosts: builder_temp_group
|
||||
gather_facts: True
|
||||
sudo: True
|
||||
user: fedora
|
||||
user: fedora
|
||||
|
||||
vars:
|
||||
# pass this options if you need to create new base image from snapshot
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
- name: spin/ensure vm with nova_compute
|
||||
- name: spin/ensure vm with nova_compute
|
||||
local_action:
|
||||
module: nova_compute
|
||||
auth_url: "{{OS_AUTH_URL}}"
|
||||
|
@ -23,5 +23,5 @@
|
|||
|
||||
- name: add builder ip to the special group
|
||||
local_action: add_host hostname={{ builder_ip }} groupname=builder_temp_group
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
galaxy_info:
|
||||
author: your name
|
||||
description:
|
||||
description:
|
||||
company: your company (optional)
|
||||
# If the issue tracker for your role is not on github, uncomment the
|
||||
# next line and provide a value
|
||||
|
@ -17,7 +17,7 @@ galaxy_info:
|
|||
min_ansible_version: 1.2
|
||||
#
|
||||
# Below are all platforms currently available. Just uncomment
|
||||
# the ones that apply to your role. If you don't see your
|
||||
# the ones that apply to your role. If you don't see your
|
||||
# platform on this list, let us know and we'll get it added!
|
||||
#
|
||||
#platforms:
|
||||
|
@ -144,4 +144,4 @@ dependencies: []
|
|||
# List your role dependencies here, one per line.
|
||||
# Be sure to remove the '[]' above if you add dependencies
|
||||
# to this list.
|
||||
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# fedmsg has a relatively static CRL (certificate revocation list) that
|
||||
# needs to be publicly accessible. We pull it here from the private
|
||||
# repo and throw it into fedoraproject.org/fedmsg/crl.pem
|
||||
# fedmsg has a relatively static CRL (certificate revocation list) that
|
||||
# needs to be publicly accessible. We pull it here from the private
|
||||
# repo and throw it into fedoraproject.org/fedmsg/crl.pem
|
||||
# See https://infrastructure.fedoraproject.org/infra/docs/fedmsg-certs.txt
|
||||
|
||||
- name: Ensure dir for content exists
|
||||
|
@ -20,8 +20,8 @@
|
|||
- fedmsg/proxy
|
||||
|
||||
# Also expose the ca cert. Everybody gets this and can read it. Public!
|
||||
# End users (fedmsg-notify) need it to be able to validate our outbound
|
||||
# messages.
|
||||
# End users (fedmsg-notify) need it to be able to validate our outbound
|
||||
# messages.
|
||||
- name: Copy over our CA cert from the private repo
|
||||
copy: >
|
||||
src={{private}}/files/fedmsg-certs/keys/ca.crt dest=/srv/web/fedmsg/ca.crt
|
||||
|
|
|
@ -67,7 +67,7 @@
|
|||
- fedora-web/main
|
||||
|
||||
# TODO -- turn these into redirects in playbooks/groups/proxies-redirect.yml
|
||||
- name: Copy over some miscellaneous redirects (for prod)
|
||||
- name: Copy over some miscellaneous redirects (for prod)
|
||||
copy: >
|
||||
src=redirects.conf.prod dest=/etc/httpd/conf.d/{{website}}/redirects.conf
|
||||
owner=root group=root mode=0644
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
---
|
||||
|
||||
#
|
||||
# This is the role for geoip-city-wsgi.
|
||||
# This is the role for geoip-city-wsgi.
|
||||
#
|
||||
# install python-paste-deploy
|
||||
- name: install python-paste-deploy
|
||||
|
@ -11,10 +11,10 @@
|
|||
- geoip-city-wsgi
|
||||
- geoip-city-wsgi/app
|
||||
|
||||
- name: install geoip-city-wsgi.conf file
|
||||
- name: install geoip-city-wsgi.conf file
|
||||
copy: >
|
||||
src="geoip-city-wsgi.conf"
|
||||
dest="/etc/httpd/conf.d/geoip-city-wsgi.conf"
|
||||
src="geoip-city-wsgi.conf"
|
||||
dest="/etc/httpd/conf.d/geoip-city-wsgi.conf"
|
||||
owner=root
|
||||
group=root
|
||||
mode=0644
|
||||
|
@ -28,10 +28,10 @@
|
|||
|
||||
- name: setup /usr/share/geoip-city-wsgi directory
|
||||
file: >
|
||||
path=/usr/share/geoip-city-wsgi
|
||||
path=/usr/share/geoip-city-wsgi
|
||||
owner=root
|
||||
group=root
|
||||
mode=0755
|
||||
group=root
|
||||
mode=0755
|
||||
state=directory
|
||||
tags:
|
||||
- geoip_config
|
||||
|
|
|
@ -21,6 +21,6 @@
|
|||
template: src=server.config dest=/etc/glusterfs/glusterd.vol mode=0640
|
||||
notify:
|
||||
- restart glusterd
|
||||
|
||||
|
||||
- name: glusterd service
|
||||
service: name=glusterd state=started enabled=yes
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
user: name=apache append=yes groups=nagios
|
||||
tags:
|
||||
- nagios/server
|
||||
|
||||
|
||||
- name: Install nagios packages
|
||||
yum: name={{ item }} state=present
|
||||
with_items:
|
||||
|
@ -50,7 +50,7 @@
|
|||
- nagios-config
|
||||
- nagios/server
|
||||
notify: restart nagios
|
||||
|
||||
|
||||
- name: Copy httpd config
|
||||
template: src=nagios-httpd.conf dest=/etc/httpd/conf.d/nagios.conf
|
||||
tags:
|
||||
|
|
|
@ -30,14 +30,14 @@
|
|||
tags:
|
||||
- nfs/client
|
||||
|
||||
#
|
||||
#
|
||||
# Install needed packages
|
||||
#
|
||||
- name: Install needed nfs packages
|
||||
package:
|
||||
name: "{{ item }}"
|
||||
state: present
|
||||
with_items:
|
||||
with_items:
|
||||
- nfs-utils
|
||||
- rpcbind
|
||||
tags:
|
||||
|
@ -65,11 +65,11 @@
|
|||
|
||||
- name: nfs mount points (phx2)
|
||||
mount: >
|
||||
name={{ mnt_dir }}
|
||||
src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }}
|
||||
fstype=nfs
|
||||
name={{ mnt_dir }}
|
||||
src=ntap-phx2-c01-fedora01-nfs.storage.phx2.redhat.com:/{{ nfs_src_dir }}
|
||||
fstype=nfs
|
||||
opts={{nfs_mount_opts}}
|
||||
passno=0
|
||||
passno=0
|
||||
dump=0
|
||||
state=mounted
|
||||
when: datacenter == 'phx2'
|
||||
|
@ -78,11 +78,11 @@
|
|||
|
||||
- name: nfs mount points (rdu)
|
||||
mount: >
|
||||
name={{ mnt_dir }}
|
||||
src=172.31.1.11:/{{ nfs_src_dir }}
|
||||
fstype=nfs
|
||||
name={{ mnt_dir }}
|
||||
src=172.31.1.11:/{{ nfs_src_dir }}
|
||||
fstype=nfs
|
||||
opts={{nfs_mount_opts}}
|
||||
passno=0
|
||||
passno=0
|
||||
dump=0
|
||||
state=mounted
|
||||
when: datacenter == 'rdu'
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
---
|
||||
dependencies:
|
||||
- { role: openvpn/base }
|
||||
- { role: openvpn/base }
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
---
|
||||
dependencies:
|
||||
- { role: openvpn/base }
|
||||
- { role: openvpn/base }
|
||||
|
|
|
@ -65,7 +65,7 @@
|
|||
- name: Remove unwanted files
|
||||
file: dest=/etc/fedmsg.d/{{item}} state=absent
|
||||
with_items:
|
||||
- endpoints.py
|
||||
- endpoints.py
|
||||
tags:
|
||||
- config
|
||||
- fedmsgdconfig
|
||||
|
|
|
@ -46,4 +46,4 @@
|
|||
# /etc/resultsdb-is-init exists or not. We've already lost a lot of data, so commenting this command out
|
||||
# while we figure out how to handle the problem
|
||||
#- name: initialize resultsdb database
|
||||
# shell: PROD='true' resultsdb init_db && touch /etc/resultsdb/db-is-init creates=/etc/resultsdb-is-init
|
||||
# shell: PROD='true' resultsdb init_db && touch /etc/resultsdb/db-is-init creates=/etc/resultsdb-is-init
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue