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-07-28 15:43:17 +00:00
commit 85ec107d1b
14 changed files with 14 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

17
roles/bodhi2/backend/files/dist-5E-epel-testing.mash
View file

@ -1,17 +0,0 @@
[dist-5E-epel-testing]
rpm_path = %(arch)s/
source_path = SRPMS/
debuginfo_path = %(arch)s/debug
debuginfo = True
multilib = True
multilib_method = devel
tag = dist-5E-epel-testing
inherit = False
strict_keys = True
keys = 217521f6
use_repoview = False
repoviewurl = http://download.fedoraproject.org/pub/epel/testing/5/%(arch)s/
repoviewtitle = "Fedora EPEL 5 Testing - %(arch)s"
arches = i386 x86_64 ppc
hash = sha
compress_type = compat

17
roles/bodhi2/backend/files/dist-5E-epel.mash
View file

@ -1,17 +0,0 @@
[dist-5E-epel]
rpm_path = %(arch)s/
source_path = SRPMS/
debuginfo_path = %(arch)s/debug
debuginfo = True
multilib = True
multilib_method = devel
tag = dist-5E-epel
inherit = False
strict_keys = True
keys = 217521f6
use_repoview = False
repoviewurl = http://download.fedoraproject.org/pub/epel/5/%(arch)s/
repoviewtitle = "Fedora EPEL 5 - %(arch)s"
arches = i386 x86_64 ppc
hash = sha
compress_type = compat

19
roles/bodhi2/backend/files/f23-updates-testing.mash
View file

@ -1,19 +0,0 @@
# mash config file
[f23-updates-testing]
rpm_path = %(arch)s/
source_path = SRPMS/
debuginfo = True
multilib = True
multilib_method = devel
tag = f23-updates-testing
inherit = False
strict_keys = True
keys = 34EC9CBA
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/23/%(arch)s/
repoviewtitle = "Fedora 23 Updates Testing - %(arch)s"
arches = armhfp i386 x86_64
hash_packages = True
delta = True
delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os

17
roles/bodhi2/backend/files/f23-updates.mash
View file

@ -1,17 +0,0 @@
[f23-updates]
rpm_path = %(arch)s/
source_path = SRPMS/
debuginfo = True
multilib = True
multilib_method = devel
tag = f23-updates
inherit = False
strict_keys = True
keys = 34EC9CBA
repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s/
repoviewtitle = "Fedora 23 Updates - %(arch)s"
arches = armhfp i386 x86_64
hash_packages = True
delta = True
delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os

16
roles/bodhi2/backend/tasks/main.yml
View file

@ -102,16 +102,12 @@
owner=apache
mode=0640
with_items:
- f23-updates.mash
- f23-updates-testing.mash
- f24-updates.mash
- f24-updates-testing.mash
- f25-updates.mash
- f25-updates-testing.mash
- f26-updates.mash
- f26-updates-testing.mash
- dist-5E-epel.mash
- dist-5E-epel-testing.mash
- dist-6E-epel.mash
- dist-6E-epel-testing.mash
- epel7.mash
@ -143,16 +139,6 @@
- bodhi
- cron
- name: sync packages from pkgdb2 to koji (el5)
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
disabled=true
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
tags:
- bodhi
- cron
- name: sync packages from pkgdb2 to koji (el6)
cron: name="owner-sync-el6" minute="7,17,27,37,47,57" user="root"
job="/usr/local/bin/owner-sync-pkgdb dist-6E-epel"
@ -236,7 +222,7 @@
- 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 /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora'"
job="/usr/local/bin/lock-wrapper fedora-updates-push '/usr/local/bin/fedora-updates-push && /usr/local/bin/update-fullfiletimelist -l /pub/fedora-secondary/update-fullfiletimelist.lock -t /pub fedora fedora-secondary'"
cron_file=updates-sync
when: inventory_hostname.startswith('bodhi-backend01') and env == "production"
tags:

4
roles/copr/backend/files/provision/provision_builder_tasks.yml
View file

@ -29,8 +29,8 @@
- nosync
- expect
- name: enable @copr/copr for now
shell: dnf copr -y enable @copr/copr
- name: disable @copr/copr explicitly
shell: dnf copr -y disable @copr/copr
- name: make sure newest rpm
dnf: state=latest pkg={{ item }}

10
roles/copr/backend/files/yum/copr_local.repo
View file

@ -1,10 +0,0 @@
[group_copr-copr_local]
name=group_copr-copr_local
baseurl=file:///var/lib/copr/public_html/results/@copr/copr/fedora-$releasever-x86_64/
type=rpm-md
gpgcheck=1
gpgkey=file:///var/lib/copr/public_html/results/@copr/copr/pubkey.gpg
enabled=1
enabled_metadata=1
skip_if_unavailable=True
priority=1

5
roles/copr/backend/tasks/main.yml
View file

@ -9,11 +9,6 @@
- group: name=copr gid=986
- user: name=copr group=copr uid=989
- name: install copr local path repo
copy: src="yum/copr_local.repo" dest="/etc/yum.repos.d/copr_local.repo"
tags:
- config
- name: install copr-backend and copr-selinux
dnf: state=latest name={{ item }}
with_items:

10
roles/copr/base/files/yum/copr-dev.repo
View file

@ -1,10 +0,0 @@
[group_copr-copr-dev]
name=Copr repo for copr-dev owned by @copr
baseurl=https://copr-be.cloud.fedoraproject.org/results/@copr/copr-dev/fedora-$releasever-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/@copr/copr-dev/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1

10
roles/copr/base/files/yum/copr.repo
View file

@ -1,10 +0,0 @@
[group_copr-copr]
name=Copr repo for copr owned by @copr
baseurl=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/fedora-$releasever-$basearch/
type=rpm-md
skip_if_unavailable=True
gpgcheck=1
gpgkey=https://copr-be.cloud.fedoraproject.org/results/@copr/copr/pubkey.gpg
repo_gpgcheck=0
enabled=1
enabled_metadata=1

11
roles/copr/base/tasks/main.yml
View file

@ -29,17 +29,6 @@
tags:
- config
- name: install copr repo
copy: src="yum/copr.repo" dest="/etc/yum.repos.d/copr.repo"
tags:
- config
- name: install copr-dev repo
copy: src="yum/copr-dev.repo" dest="/etc/yum.repos.d/copr-dev.repo"
when: env == "staging"
tags:
- config
- name: install common copr packages
dnf: state=present pkg={{ item }}
with_items:

3
roles/copr/mbs/tasks/main.yml
View file

@ -6,9 +6,6 @@
command: dnf install --refresh -y python2 python2-dnf libselinux-python
- name: Enable copr repo
command: dnf -y copr enable @copr/copr
- name: Install stuff
dnf: name={{ item }} state=latest
with_items:

9
roles/distgit/pagure/templates/pagure.cfg
View file

@ -99,8 +99,14 @@ TICKETS_FOLDER = None
### Folder containing the clones of the remotes git repo
REMOTE_GIT_FOLDER = '/srv/git/remotes'
### Folder where to run gl-compile-conf from
GITOLITE_HOME = '/srv/git/'
### Configuration file for gitolite
GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf.pagure'
GITOLITE_CONFIG = '/srv/git/.gitolite/conf/gitolite.conf'
### File to include at the top of the gitolite configuration file
GITOLITE_PRE_CONFIG = '/var/tmp/gitolite-prefix.txt'
### Temp folder to be used to make the clones to work around bug in libgit2:
## refs: https://github.com/libgit2/libgit2/issues/2965
@ -176,6 +182,7 @@ ENABLE_NEW_PROJECTS = False
ENABLE_DEL_PROJECTS = False
ENABLE_TICKETS = False
ENABLE_USER_MNGT = False
ENABLE_GROUP_MNGT = False
ALLOWED_PREFIX = ['rpms', 'modules', 'container']
DISABLED_PLUGINS = ['IRC', 'Pagure tickets', 'Read the Doc']

3
roles/mbs/common/templates/config.py
View file

@ -175,3 +175,6 @@ class ProdConfiguration(BaseConfiguration):
# Don't let people submit yaml directly. it has to come from dist-git
YAML_SUBMIT_ALLOWED = False
# Set the priority to 4 to have higher priority than F27 mass rebuild.
KOJI_BUILD_PRIORITY = 4