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:
Chaoyi Zha 2016-02-22 21:21:45 +00:00
commit fcaaea9a0d
10 changed files with 28 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

13
inventory/group_vars/buildhw
View file

@ -19,16 +19,3 @@ 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
{% if env == "staging" %}
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"
{% else %}
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"
{% endif %}

13
inventory/group_vars/buildvm
View file

@ -30,16 +30,3 @@ 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
{% if env == "staging" %}
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"
{% else %}
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"
{% endif %}

13
inventory/group_vars/koji-hub
View file

@ -1,13 +0,0 @@
---
# These variables are for koji-containerbuild/osbs
{% if env == "staging" %}
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"
{% else %}
osbs_fqdn: "osbs.fedorainfracloud.org"
docker_registry: "registry.fedoraproject.org"
koji_root: "koji.fedoraproject.org/koji"
koji_hub: "koji.fedoraproject.org/kojihub"
{% endif %}

27
playbooks/groups/buildhw.yml
View file

@ -29,33 +29,6 @@
- hosts
- { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
- { role: sudo, when: not inventory_hostname.startswith('bkernel') }
- {
role: osbs-client,
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,33 +36,6 @@
- { 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,34 +29,6 @@
- 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

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

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

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

@ -72,14 +72,9 @@ serverca = /etc/kojid/cacert.pem
{% if 'runroot' in group_names %}
; Config for it lives in /etc/kojid/runroot.conf
plugins = runroot builder_container
plugins = runroot
; 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,7 +10,6 @@
- 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 hub_containerbuild
Plugins = fedmsg-koji-plugin runroot_hub
{% if inventory_hostname.startswith('koji') %}
[policy]