diff --git a/inventory/group_vars/sundries b/inventory/group_vars/sundries index 3f11362298..60a0415c96 100644 --- a/inventory/group_vars/sundries +++ b/inventory/group_vars/sundries @@ -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 diff --git a/inventory/group_vars/sundries-stg b/inventory/group_vars/sundries-stg index 3fa7987979..e64fe7513f 100644 --- a/inventory/group_vars/sundries-stg +++ b/inventory/group_vars/sundries-stg @@ -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 diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org index 15312d4b8a..8f232ffa14 100644 --- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org @@ -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 diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org index 4e462088bd..971bcf8c78 100644 --- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org @@ -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 diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 701e427f89..5a3a86e14f 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -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'] } diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index e731fa92a0..1f10737ea1 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -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 diff --git a/roles/notifs/frontend/tasks/main.yml b/roles/notifs/frontend/tasks/main.yml index d33e1b78ce..55093fa087 100644 --- a/roles/notifs/frontend/tasks/main.yml +++ b/roles/notifs/frontend/tasks/main.yml @@ -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 diff --git a/roles/notifs/frontend/templates/fmn.web.conf b/roles/notifs/frontend/templates/fmn.web.conf index 1362f654c5..3ebce15945 100644 --- a/roles/notifs/frontend/templates/fmn.web.conf +++ b/roles/notifs/frontend/templates/fmn.web.conf @@ -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 %} WSGIProcessGroup fmn diff --git a/roles/osbs-client/files/README b/roles/osbs-client/files/README new file mode 100644 index 0000000000..6f8b02c0cf --- /dev/null +++ b/roles/osbs-client/files/README @@ -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 diff --git a/roles/osbs-client/tasks/main.yml b/roles/osbs-client/tasks/main.yml index 120ec95156..7a1ae6d454 100644 --- a/roles/osbs-client/tasks/main.yml +++ b/roles/osbs-client/tasks/main.yml @@ -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" diff --git a/roles/regcfp/templates/config.json b/roles/regcfp/templates/config.json index e2b66a91b5..ee32185c5e 100644 --- a/roles/regcfp/templates/config.json +++ b/roles/regcfp/templates/config.json @@ -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": {