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

git pull

Browse source 
Merge branch 'master' of /git/ansible
This commit is contained in:
aikidouke 2016-03-31 19:13:20 +00:00
commit b5a9729d44
13 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/pdc-web
View file

@ -31,3 +31,5 @@ fedmsg_certs:
group: apache
can_send:
- pdc.compose
- pdc.rpms
- pdc.images

2
inventory/group_vars/pdc-web-stg
View file

@ -31,3 +31,5 @@ fedmsg_certs:
group: apache
can_send:
- pdc.compose
- pdc.rpms
- pdc.images

4
inventory/host_vars/koschei01.stg.phx2.fedoraproject.org
View file

@ -3,8 +3,8 @@ 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/
ks_url: http://10.5.126.23/repo/rhel/ks/kvm-fedora-23
ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
volgroup: /dev/vg_guests
eth0_ip: 10.5.126.221

1
playbooks/groups/buildhw.yml
View file

@ -41,6 +41,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

1
playbooks/groups/buildvm.yml
View file

@ -48,6 +48,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

1
playbooks/groups/koji-hub.yml
View file

@ -43,6 +43,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',

1
playbooks/hosts/osbs-dev.fedorainfracloud.org.yml
View file

@ -120,6 +120,7 @@
default: {
username: "{{ osbs_koji_stg_username }}",
password: "{{ osbs_koji_stg_password }}",
koji_certs_secret: "koji",
openshift_url: 'https://osbs-dev.fedorainfracloud.org:8443/',
registry_uri: 'https://osbs-dev.fedorainfracloud.org:5000/v2',
source_registry_uri: 'https://osbs-dev.fedorainfracloud.org:5000/v2',

4
playbooks/manual/upgrade/koschei.yml
View file

@ -26,10 +26,10 @@
- name: clean yum metadata
command: yum clean all {% if env == 'staging' %} --enablerepo="koschei-jenkins" {% endif %}
- name: upgrade koschei package from jenkins
yum: name="koschei" state=latest enablerepo="koschei-jenkins"
package: name="koschei" state=latest enablerepo="koschei-jenkins"
when: env == 'staging'
- name: upgrade koschei from main repo
yum: name="koschei" state=latest
package: name="koschei" state=latest
when: env != 'staging'
- name: run db migration
become: yes

2
roles/koschei/tasks/main.yml
View file

@ -8,7 +8,7 @@
- yumrepos
- name: install packages
yum: name={{ item }} state=installed
package: name={{ item }} state=installed
with_items:
- koschei
- lbzip2

4
roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2
View file

@ -48,14 +48,14 @@ command[check_fedmsg_cbacklog_value]={{libdir}}/nagios/plugins/check_fedmsg_cons
command[check_fedmsg_cbacklog_pkgs]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub GenACLsConsumer 10 50
command[check_fedmsg_cbacklog_summershum]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub SummerShumConsumer 100 500
command[check_fedmsg_cbacklog_badges_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FedoraBadgesConsumer 5000 10000
command[check_fedmsg_cbacklog_notifs_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FMNConsumer 2000 5000
command[check_fedmsg_cbacklog_notifs_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub FMNConsumer 15000 20000
command[check_fedmsg_cbacklog_bugzilla2fedmsg]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py moksha-hub BugzillaConsumer 10 100
command[check_fedmsg_cbacklog_fedimg_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub KojiConsumer 2000 5000
command[check_fedmsg_cbacklog_hotness_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub BugzillaTicketFiler 100 500
command[check_fedmsg_cbacklog_bodhi_backend01_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub Masher 500 1000
command[check_fedmsg_cbacklog_bodhi_backend02_hub]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub UpdatesHandler 500 1000
command[check_fedmsg_cbacklog_autocloud_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub AutoCloudConsumer 100 500
command[check_fedmsg_cbacklog_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub CacheInvalidator 5000 10000
command[check_fedmsg_cbacklog_packages_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub CacheInvalidator 20000 30000
command[check_fedmsg_cbacklog_bugyou_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub BugyouConsumer 5000 10000
command[check_fedmsg_cbacklog_pdc_backend]={{libdir}}/nagios/plugins/check_fedmsg_consumer_backlog.py fedmsg-hub PDCUpdater 2000 10000

14
roles/openqa/server/tasks/main.yml
View file

@ -121,13 +121,13 @@
changed_when: "1 != 1"
always_run: true
#- name: Create hard disk images (this may take a long time!)
# command: "/root/openqa_fedora_tools/tools/createhdds.py all --clean"
# args:
# chdir: /var/lib/openqa/share/factory/hdd/
# environment:
# LIBGUESTFS_BACKEND: direct
# when: "diskcheck.rc > 0"
- name: Create hard disk images (this may take a long time!)
command: "/root/openqa_fedora_tools/tools/createhdds.py all --clean"
args:
chdir: /var/lib/openqa/share/factory/hdd/
environment:
LIBGUESTFS_BACKEND: direct
when: "diskcheck.rc > 0"
- name: Create exports file
copy: src=exports dest=/etc/exports.d/openqa.exports owner=root group=root mode=0644

1
roles/osbs-client/defaults/main.yml
View file

@ -32,3 +32,4 @@ default:
distribution_scope: private
registry_api_versions: v2
builder_openshift_url: https://172.17.0.1:8443/
koji_certs_secret: false

3
roles/osbs-client/templates/osbs.conf.j2
View file

@ -10,6 +10,9 @@ username = {{ default.username }}
{% if default.password %}
password = {{ default.password }}
{% endif %}
{% if default.koji_certs_secret %}
koji_certs_secret = {{ default.koji_certs_secret }}
{% endif %}
openshift_url = {{ default.openshift_url }}
koji_root = {{ default.koji_root }}
koji_hub = {{ default.koji_hub }}