Infrastructure/ansible
3
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:
Chaoyi Zha 2016-02-29 23:01:29 +00:00
commit cd8ab3af7d
22 changed files with 193 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
inventory/group_vars/buildarm
View file

@ -18,3 +18,9 @@ csi_relationship: |
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
# These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"

6
inventory/group_vars/buildhw
View file

@ -19,3 +19,9 @@ csi_relationship: |
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
# These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"

6
inventory/group_vars/buildvm
View file

@ -30,3 +30,9 @@ csi_relationship: |
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
# These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"

6
inventory/group_vars/buildvm-stg
View file

@ -33,3 +33,9 @@ csi_relationship: |
* Relies on koji-hub, Packages, PkgDB, apache, fedmsg, fas, virthost, and is monitored by nagios
* Several services rely on the builders, including koschei, Bodhi, Tagger, SCM, Darkserver.
* Produces automated builds of packages for the architecture listed. Builders can be scaled by adding new
# These variables are for koji-containerbuild/osbs
osbs_fqdn: "osbs-dev.fedorainfracloud.org"
docker_registry: "osbs-dev.fedorainfracloud.org"
koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub"

5
inventory/group_vars/koji
View file

@ -43,3 +43,8 @@ fedmsg_certs:
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=3"
virt_install_command: "{{ virt_install_command_two_nic }}"
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"

13
inventory/group_vars/koji-stg
View file

@ -41,3 +41,16 @@ sudoers: "{{ private }}/files/sudo/releng-sudoers"
koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.fedoraproject.org/"
osbs_fqdn: "osbs-dev.fedorainfracloud.org"
docker_registry: "osbs-dev.fedorainfracloud.org"
koji_root: "koji.stg.fedoraproject.org/koji"
koji_hub: "koji.stg.fedoraproject.org/kojihub"
# Add custom iptable rule to allow stage koji to talk to
# osbs-dev.fedorainfracloud.org (will move to stage osbs later, this is for the
# sake of testing).
custom_rules: [
'-A OUTPUT -p tcp -m tcp -d 209.132.184.60 --dport 8443 -j ACCEPT'
]

1
inventory/inventory
View file

@ -622,6 +622,7 @@ pdc-web01.stg.phx2.fedoraproject.org
pkgdb01.stg.phx2.fedoraproject.org
pkgs01.stg.phx2.fedoraproject.org
proxy01.stg.phx2.fedoraproject.org
qa-stg01.qa.fedoraproject.org:222
resultsdb-stg01.qa.fedoraproject.org
statscache-web01.stg.phx2.fedoraproject.org
statscache-web02.stg.phx2.fedoraproject.org

28
playbooks/groups/buildhw.yml
View file

@ -29,6 +29,34 @@
- hosts
- { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
- { role: sudo, when: not inventory_hostname.startswith('bkernel') }
- {
role: osbs-client,
when: env == 'staging',
general: {
verbose: 0,
build_json_dir: '/usr/share/osbs/',
openshift_required_version: 1.1.0,
},
default: {
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',
build_host: '{{ osbs_fqdn }}',
koji_root: 'http://{{ koji_root }}',
koji_hub: 'http://{{ koji_hub }}',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
vendor: 'Fedora Project',
verify_ssl: false,
use_auth: false,
builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2',
builder_openshift_url: 'https://172.17.0.1:8443/'
}
}
tasks:
- include: "{{ tasks }}/2fa_client.yml"

27
playbooks/groups/buildvm.yml
View file

@ -36,6 +36,33 @@
- { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
- { role: sudo, when: not inventory_hostname.startswith('bkernel') }
- koji_builder
- {
role: osbs-client,
when: env == 'staging',
general: {
verbose: 0,
build_json_dir: '/usr/share/osbs/',
openshift_required_version: 1.1.0,
},
default: {
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',
build_host: '{{ osbs_fqdn }}',
koji_root: 'http://{{ koji_root }}',
koji_hub: 'http://{{ koji_hub }}',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
vendor: 'Fedora Project',
verify_ssl: false,
use_auth: false,
builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2',
builder_openshift_url: 'https://172.17.0.1:8443/'
}
}
tasks:
- include: "{{ tasks }}/2fa_client.yml"

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

@ -29,6 +29,34 @@
- koji_hub
- { role: rsyncd, when: not inventory_hostname.startswith('koji') }
- { role: koji_builder, when: env == "staging" or inventory_hostname.startswith('s390') or inventory_hostname.startswith('arm') }
- {
role: osbs-client,
when: env == 'staging',
general: {
verbose: 0,
build_json_dir: '/usr/share/osbs/',
openshift_required_version: 1.1.0,
},
default: {
openshift_url: 'https://{{ osbs_fqdn }}:8443/',
registry_uri: 'https://{{ docker_registry }}:5000/v2',
source_registry_uri: 'https://{{ docker_registry }}:5000/v2',
build_host: '{{ osbs_fqdn }}',
koji_root: 'http://{{ koji_root }}',
koji_hub: 'http://{{ koji_hub }}',
sources_command: 'fedpkg sources',
build_type: 'prod',
authoritative_registry: 'registry.example.com',
vendor: 'Fedora Project',
verify_ssl: false,
use_auth: false,
builder_use_auth: true,
distribution_scope: 'private',
registry_api_versions: 'v2',
builder_openshift_url: 'https://172.17.0.1:8443/'
}
}
- { role: nfs/server, when: env == "staging" }
- { role: keepalived, when: env == "production" and inventory_hostname.startswith('koji') }
- role: nfs/client

6
roles/copr/backend/files/provision/builderpb_ppc64le.yml
View file

@ -39,6 +39,12 @@
tasks:
- include: "provision_builder_tasks.yml"
- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.15/1.fc22/noarch/mock-1.2.15-1.fc22.noarch.rpm dest=/tmp/
when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int == 22
- yum: state=present name=/tmp/mock-1.2.15-1.fc22.noarch.rpm
when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int == 22
- name: disable offloading
command: ethtool -K enp0s1 tso off gro off gso off

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

@ -39,6 +39,7 @@
- rpm
- glib2
- ca-certificates
- mock
- copy: src=files/fedpkg-copr.conf dest=/etc/rpkg/fedpkg-copr.conf

2
roles/copr/dist_git/files/dist-git.conf
View file

@ -17,7 +17,7 @@ admin_groups=cvsadmin
# comma separated list of active branches to create ACLs for
# example:
active_branches=el5,el6,el7,epel7,f21,f22,f23,master
active_branches=el5,el6,el7,epel7,f22,f23,f24,master
# a "regex"ish list of the reserved branches
# example:

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

@ -55,6 +55,9 @@
- name: install config for copr-dist-git
template: src=copr-dist-git.conf.j2 dest=/etc/copr/copr-dist-git.conf mode=0644
tags:
- config
- name: set git variables for copr-service user
copy: src=".gitconfig" dest="/home/copr-service/.gitconfig"
@ -73,6 +76,8 @@
- reload httpd
- copy: src="dist-git.conf" dest="/etc/dist-git/dist-git.conf" mode=0644
tags:
- config
- copy: src="ssh_config" dest="/home/copr-service/.ssh/config" owner=copr-service group=copr-service mode=0600

10
roles/fedora-web/build/files/syncStatic.stg.sh
View file

@ -24,11 +24,11 @@ function build {
return $rc;
}
if [ ! -d /srv/web/fedora-web/.git ]
if [ ! -d /srv/web/fedora-websites/.git ]
then
/usr/bin/git clone -q \
git://git.fedorahosted.org/fedora-web.git \
/srv/web/fedora-web
https://pagure.io/fedora-websites.git \
/srv/web/fedora-websites
fi
# Freeze the website to prepare beta changes. On release day, comment the git
@ -41,11 +41,11 @@ fi
#
# Good luck!
cd /srv/web/fedora-web
cd /srv/web/fedora-websites
/usr/bin/git clean -q -fdx || exit 1
/usr/bin/git reset -q --hard || exit 1
/usr/bin/git checkout -q flock2016 || exit 1
/usr/bin/git checkout -q f24-alpha || exit 1
/usr/bin/git pull -q --ff-only || exit 1
build spins.fedoraproject.org

8
roles/hotness/tasks/main.yml
View file

@ -1,5 +1,13 @@
---
# Configuration for the the-new-hotness consumer
#
- name: install rebase helper from epel-testing
yum: pkg={{ item }} state=present enablerepo=epel-testing
with_items:
- rebase-helper
tags:
- packages
- hotness
- name: install needed packages
yum: pkg={{ item }} state=present

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

@ -72,6 +72,7 @@
with_items:
- yum-utils
- koji-builder
- koji-containerbuild-builder
- strace
- mock
- kernel-firmware
@ -101,6 +102,7 @@
with_items:
- yum-utils
- koji-builder
- koji-containerbuild-builder
- strace
- mock
- kernel-firmware

7
roles/koji_builder/templates/kojid.conf
View file

@ -72,9 +72,14 @@ serverca = /etc/kojid/cacert.pem
{% if 'runroot' in group_names %}
; Config for it lives in /etc/kojid/runroot.conf
plugins = runroot
plugins = runroot builder_container
; We use the hub's plugin path since that's where
; the package installs the builder plugin.
pluginpath = /usr/lib/koji-hub-plugins
{% else %}
plugins = builder_container
{% endif %}

1
roles/koji_hub/tasks/main.yml
View file

@ -10,6 +10,7 @@
- koji-web
- koji-utils
- koji-theme-fedora
- koji-containerbuild-hub
- mod_ssl
- mod_wsgi
- git

2
roles/koji_hub/templates/hub.conf.j2
View file

@ -75,7 +75,7 @@ DisableNotifications = True
#Plugins = koji-disable-builds-plugin
#Plugins = darkserver-plugin
Plugins = fedmsg-koji-plugin runroot_hub
Plugins = fedmsg-koji-plugin runroot_hub hub_containerbuild
{% if inventory_hostname.startswith('koji') %}
[policy]

4
roles/releng/files/branched
View file

@ -1,3 +1,3 @@
# branched compose
#MAILTO=releng-cron@lists.fedoraproject.org
#15 7 * * * masher TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone -n https://pagure.io/releng.git && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildbranched $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora
MAILTO=releng-cron@lists.fedoraproject.org
15 7 * * * root TMPDIR=`mktemp -d /tmp/branched.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && git checkout f24 && LANG=en_US.UTF-8 ./nightly.sh && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora

2
roles/releng/files/rawhide
View file

@ -1,3 +1,3 @@
# rawhide compose
MAILTO=releng-cron@lists.fedoraproject.org
#15 5 * * * masher TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone -n https://pagure.io/releng.git && cd releng && git checkout -b stable rawhide-stable && LANG=en_US.UTF-8 ./scripts/buildrawhide $(date "+\%Y\%m\%d") && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora
15 5 * * * root TMPDIR=`mktemp -d /tmp/rawhide.XXXXXX` && cd $TMPDIR && git clone https://pagure.io/pungi-fedora.git && cd pungi-fedora && LANG=en_US.UTF-8 ./nightly.sh && sudo -u ftpsync /usr/local/bin/update-fullfilelist fedora