diff --git a/inventory/group_vars/pdc-web b/inventory/group_vars/pdc-web index 59073dad2c..eeefe04f16 100644 --- a/inventory/group_vars/pdc-web +++ b/inventory/group_vars/pdc-web @@ -31,3 +31,5 @@ fedmsg_certs: group: apache can_send: - pdc.compose + - pdc.rpms + - pdc.images diff --git a/inventory/group_vars/pdc-web-stg b/inventory/group_vars/pdc-web-stg index a7e45f96c4..2afec3241a 100644 --- a/inventory/group_vars/pdc-web-stg +++ b/inventory/group_vars/pdc-web-stg @@ -31,3 +31,5 @@ fedmsg_certs: group: apache can_send: - pdc.compose + - pdc.rpms + - pdc.images diff --git a/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org b/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org index d9cd3d03c5..c408ba6d36 100644 --- a/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/koschei01.stg.phx2.fedoraproject.org @@ -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 diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 283ed6b768..bea92d584c 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -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', diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index a1b79443aa..c1bda784ba 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -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', diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 1e63733286..21a5800701 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -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', diff --git a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml index 10ecfb245c..bbfced9e36 100644 --- a/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/osbs-dev.fedorainfracloud.org.yml @@ -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', diff --git a/playbooks/manual/upgrade/koschei.yml b/playbooks/manual/upgrade/koschei.yml index 8a41f41938..96a2b42786 100644 --- a/playbooks/manual/upgrade/koschei.yml +++ b/playbooks/manual/upgrade/koschei.yml @@ -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 diff --git a/roles/koschei/tasks/main.yml b/roles/koschei/tasks/main.yml index 5ab80671c1..67b3885bce 100644 --- a/roles/koschei/tasks/main.yml +++ b/roles/koschei/tasks/main.yml @@ -8,7 +8,7 @@ - yumrepos - name: install packages - yum: name={{ item }} state=installed + package: name={{ item }} state=installed with_items: - koschei - lbzip2 diff --git a/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 b/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 index e67581d8c3..775ce14535 100644 --- a/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 +++ b/roles/nagios/client/templates/check_fedmsg_consumers.cfg.j2 @@ -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 diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index fb6b4c83a2..720473630b 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -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 diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml index 17a6f4bcc5..034abd4fe2 100644 --- a/roles/osbs-client/defaults/main.yml +++ b/roles/osbs-client/defaults/main.yml @@ -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 diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2 index b8df8ccb6b..2a2d35e1ca 100644 --- a/roles/osbs-client/templates/osbs.conf.j2 +++ b/roles/osbs-client/templates/osbs.conf.j2 @@ -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 }}