bodhi: Move bodhi_openshift_pods and bodhi_version to os and os_stg and drop the bodhi2 and bodhi2_stg groups again.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi
Pierre-Yves Chibon
parent
1c033d715d
commit
c1d9e6155c
9 changed files with 33 additions and 218 deletions
|
|
@ -1,120 +0,0 @@
|
|||
---
|
||||
# Define resources for this group of hosts here.
|
||||
jobrunner: false
|
||||
epelmasher: false
|
||||
|
||||
lvm_size: 40000
|
||||
mem_size: 16384
|
||||
num_cpus: 4
|
||||
|
||||
# Do not use testing repositories on production
|
||||
testing: False
|
||||
|
||||
# for systems that do not match the above - specify the same parameter in
|
||||
# the host_vars/$hostname file
|
||||
|
||||
host_group: bodhi2
|
||||
|
||||
# Fixed Bodhi version
|
||||
bodhi_version: 4.1.1-2.fc29.infra
|
||||
|
||||
# Definining these vars has a number of effects
|
||||
# 1) mod_wsgi is configured to use the vars for its own setup
|
||||
# 2) iptables opens enough ports for all threads for fedmsg
|
||||
# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads
|
||||
wsgi_fedmsg_service: bodhi
|
||||
wsgi_procs: 4
|
||||
wsgi_threads: 15
|
||||
|
||||
# How many openshift pods do we want?
|
||||
openshift_pods: 2
|
||||
|
||||
tcp_ports: [ 80 ]
|
||||
|
||||
# Neeed for rsync from log01 for logs.
|
||||
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
||||
|
||||
fas_client_groups: sysadmin-noc,sysadmin-bodhi,sysadmin-veteran
|
||||
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
|
||||
|
||||
# These set a config value in /etc/fedmsg.d/, see roles/bodhi2/base/
|
||||
# frontend nodes won't run either of these
|
||||
bodhi_masher_enabled: False
|
||||
bodhi_updates_handler_enabled: False
|
||||
bodhi_signed_handler_enabled: False
|
||||
|
||||
# These are consumed by a task in roles/fedmsg/base/main.yml
|
||||
fedmsg_certs:
|
||||
- service: shell
|
||||
owner: root
|
||||
group: sysadmin
|
||||
can_send:
|
||||
- logger.log
|
||||
- service: bodhi
|
||||
owner: root
|
||||
group: bodhi
|
||||
can_send:
|
||||
- bodhi.buildroot_override.tag
|
||||
- bodhi.buildroot_override.untag
|
||||
- bodhi.stack.delete
|
||||
- bodhi.stack.save
|
||||
- bodhi.update.comment
|
||||
- bodhi.update.complete.testing
|
||||
- bodhi.update.edit
|
||||
- bodhi.update.karma.threshold.reach
|
||||
- bodhi.update.request.obsolete
|
||||
- bodhi.update.request.revoke
|
||||
- bodhi.update.request.stable
|
||||
- bodhi.update.request.testing
|
||||
- bodhi.update.request.batched
|
||||
- bodhi.update.request.unpush
|
||||
- bodhi.update.requirements_met.stable
|
||||
|
||||
# Things that only the mash does - not the web UI
|
||||
#- bodhi.mashtask.complete
|
||||
#- bodhi.mashtask.mashing
|
||||
#- bodhi.mashtask.start
|
||||
#- bodhi.mashtask.sync.done
|
||||
#- bodhi.mashtask.sync.wait
|
||||
#- bodhi.errata.publish
|
||||
#- bodhi.update.eject
|
||||
|
||||
# Rsync messages that get run from somewhere else entirely.
|
||||
#- bodhi.updates.epel.sync
|
||||
#- bodhi.updates.fedora.sync
|
||||
|
||||
|
||||
# For the MOTD
|
||||
csi_security_category: Moderate
|
||||
csi_primary_contact: Bodhi Admins bodhiadmin-members@fedoraproject.org
|
||||
csi_purpose: Run the Bodhi mod_wsgi app for bodhi.fedoraproject.org
|
||||
csi_relationship: |
|
||||
The apache/mod_wsgi app is the only thing really running here.
|
||||
The mashing of repos is handled by the bodhi-backend node(s).
|
||||
|
||||
* This host relies on:
|
||||
* db01 for its database.
|
||||
* it doesn't have a networked cache of its own.. but it keeps a local
|
||||
cache in /var/cache/bodhi/
|
||||
* taksotron (resultsdb) for getting status-check results (gating updates).
|
||||
|
||||
* It also depends on these things, but we're trying to move them exclusively
|
||||
to bodhi-backend02.
|
||||
* koji for tagging and untagging updates and listing candidate builds
|
||||
* bugzilla, for getting bug title information and for posting comments
|
||||
about status changes
|
||||
* the wiki for getting information about QA "Test Cases"
|
||||
|
||||
* It provides a website that, on the client side depends on:
|
||||
* datagrepper queries to show the newfeed on the frontpage
|
||||
* the websocket server for popup notifications of others' activity.
|
||||
* the fedora-packages JSON api for suggesting package search results
|
||||
|
||||
* Quite a few things rely on this webapp
|
||||
* Taskotron historically would comment on updates about the status of
|
||||
their checks.
|
||||
* Blockerbugs checks bodhi for lists of updates.
|
||||
* fedora-packages will try to query bodhi for the release status of
|
||||
updates.
|
||||
* fedora-easy-karma, abrt, 'fedpkg update', an eclipse plugin and other
|
||||
client tools make queries to the bodhi webapp here.
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
---
|
||||
# Define resources for this group of hosts here.
|
||||
jobrunner: false
|
||||
epelmasher: false
|
||||
|
||||
lvm_size: 40000
|
||||
mem_size: 4096
|
||||
num_cpus: 2
|
||||
|
||||
# for systems that do not match the above - specify the same parameter in
|
||||
# the host_vars/$hostname file
|
||||
|
||||
# Use the infra-testing repo
|
||||
testing: True
|
||||
|
||||
# Fixed Bodhi version
|
||||
bodhi_version: 5.0.0-0.beta.6.17779cf.fc30.infra
|
||||
|
||||
# configure mod_wsgi to use the vars for its own setup
|
||||
wsgi_procs: 2
|
||||
wsgi_threads: 2
|
||||
|
||||
# How many openshift pods do we want?
|
||||
openshift_pods: 1
|
||||
|
||||
tcp_ports: [ 80 ]
|
||||
|
||||
# Neeed for rsync from log01 for logs.
|
||||
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
||||
|
||||
fas_client_groups: sysadmin-noc,sysadmin-bodhi,sysadmin-veteran
|
||||
sudoers: "{{ private }}/files/sudo/00releng-sudoers"
|
||||
|
||||
host_group: bodhi2
|
||||
|
||||
# Mount /mnt/fedora_koji as read-only in staging
|
||||
nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid"
|
||||
datacenter: staging
|
||||
|
||||
# For the MOTD
|
||||
csi_security_category: Moderate
|
||||
csi_primary_contact: Bodhi Admins bodhiadmin-members@fedoraproject.org
|
||||
csi_purpose: Run the Bodhi mod_wsgi app for bodhi.fedoraproject.org
|
||||
csi_relationship: |
|
||||
The apache/mod_wsgi app is the only thing really running here.
|
||||
The mashing of repos is handled by the bodhi-backend node(s).
|
||||
|
||||
* This host relies on:
|
||||
* db01 for its database.
|
||||
* it doesn't have a networked cache of its own.. but it keeps a local
|
||||
cache in /var/cache/bodhi/
|
||||
* taksotron (resultsdb) for getting status-check results (gating updates).
|
||||
|
||||
* It also depends on these things, but we're trying to move them exclusively
|
||||
to the backend.
|
||||
* koji for tagging and untagging updates and listing candidate builds
|
||||
* bugzilla, for getting bug title information and for posting comments
|
||||
about status changes
|
||||
* the wiki for getting information about QA "Test Cases"
|
||||
|
||||
* It provides a website that, on the client side depends on:
|
||||
* datagrepper queries to show the newfeed on the frontpage
|
||||
* the websocket server for popup notifications of others' activity.
|
||||
* the fedora-packages JSON api for suggesting package search results
|
||||
|
||||
* Quite a few things rely on this webapp
|
||||
* Taskotron historically would comment on updates about the status of
|
||||
their checks.
|
||||
* Blockerbugs checks bodhi for lists of updates.
|
||||
* fedora-packages will try to query bodhi for the release status of
|
||||
updates.
|
||||
* fedora-easy-karma, abrt, 'fedpkg update', an eclipse plugin and other
|
||||
client tools make queries to the bodhi webapp here.
|
||||
|
|
@ -7,3 +7,10 @@ nagios_Check_Services:
|
|||
swap: false
|
||||
nrpe: false
|
||||
mail: false
|
||||
|
||||
#
|
||||
# Set some bodhi variables here.
|
||||
# Since they are used when running playbooks against the master nodes.
|
||||
#
|
||||
bodhi_version: 4.1.1-2.fc29.infra
|
||||
bodhi_openshift_pods: 2
|
||||
|
|
|
|||
|
|
@ -7,3 +7,9 @@ nagios_Check_Services:
|
|||
swap: false
|
||||
nrpe: false
|
||||
mail: false
|
||||
|
||||
# Set some bodhi variables here.
|
||||
# Since they are used when running playbooks against the master nodes.
|
||||
#
|
||||
bodhi_version: 5.0.0-0.beta.6.17779cf.fc30.infra
|
||||
bodhi_openshift_pods: 1
|
||||
|
|
|
|||
|
|
@ -266,11 +266,6 @@ autosign01.phx2.fedoraproject.org
|
|||
[autosign_stg]
|
||||
autosign01.stg.phx2.fedoraproject.org
|
||||
|
||||
# these empty groups are here to allow for group vars for these hosts.
|
||||
[bodhi2]
|
||||
|
||||
[bodhi2_stg]
|
||||
|
||||
[dbserver]
|
||||
db01.phx2.fedoraproject.org
|
||||
db03.phx2.fedoraproject.org
|
||||
|
|
|
|||
|
|
@ -76,9 +76,9 @@
|
|||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||
|
||||
tasks:
|
||||
- command: oc -n bodhi scale dc/bodhi-web --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
- command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
- command: oc -n bodhi scale dc/bodhi-celery --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
- command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi2_openshift_pods }}
|
||||
- command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ bodhi2_openshift_pods }}
|
||||
- command: oc -n bodhi scale dc/bodhi-celery --replicas={{ bodhi2_openshift_pods }}
|
||||
|
||||
- name: bring staging services up (httpd)
|
||||
hosts: bodhi2_stg
|
||||
|
|
|
|||
|
|
@ -140,10 +140,10 @@
|
|||
|
||||
tasks:
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi_openshift_pods }}
|
||||
when: env != "staging"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "staging"
|
||||
|
||||
post_tasks:
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
- include_vars: dir=/srv/web/infra/ansible/vars/all/ ignore_files=README
|
||||
- set_fact:
|
||||
args:
|
||||
bodhi_version: "{{ hostvars[groups['bodhi2_stg'][0]]['bodhi_version'] }}"
|
||||
bodhi_version: "{{ bodhi_version }}"
|
||||
when: env == "staging"
|
||||
- set_fact:
|
||||
args:
|
||||
bodhi_version: "{{ hostvars[groups['bodhi2'][0]]['bodhi_version'] }}"
|
||||
bodhi_version: "{{ bodhi_version }}"
|
||||
when: env == "production"
|
||||
|
||||
roles:
|
||||
|
|
@ -137,20 +137,20 @@
|
|||
|
||||
post_tasks:
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "production"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-celery --replicas={{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-celery --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "production"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "production"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-consumer --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "staging"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-celery --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-celery --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "staging"
|
||||
- name: Scale up pods
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
command: oc -n bodhi scale dc/bodhi-web --replicas={{ bodhi_openshift_pods }}
|
||||
when: env == "staging"
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ items:
|
|||
name: bodhi-web
|
||||
spec:
|
||||
{% if env == "staging" %}
|
||||
replicas: {{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% else %}
|
||||
replicas: {{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% endif %}
|
||||
selector:
|
||||
deploymentconfig: bodhi-web
|
||||
|
|
@ -122,9 +122,9 @@ items:
|
|||
name: bodhi-consumer
|
||||
spec:
|
||||
{% if env == "staging" %}
|
||||
replicas: {{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% else %}
|
||||
replicas: {{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% endif %}
|
||||
selector:
|
||||
deploymentconfig: bodhi-consumer
|
||||
|
|
@ -217,9 +217,9 @@ items:
|
|||
name: bodhi-celery
|
||||
spec:
|
||||
{% if env == "staging" %}
|
||||
replicas: {{ hostvars[groups['bodhi2_stg'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% else %}
|
||||
replicas: {{ hostvars[groups['bodhi2'][0]]['openshift_pods'] }}
|
||||
replicas: {{ bodhi_openshift_pods }}
|
||||
{% endif %}
|
||||
selector:
|
||||
deploymentconfig: bodhi-celery
|
||||
|
|
@ -299,4 +299,4 @@ items:
|
|||
type: ImageChange
|
||||
- type: ConfigChange
|
||||
kind: List
|
||||
metadata: {}
|
||||
metadata: {}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue