From 861d9dae3ae0d51f94e37bc9a3ff36353b4e9bb1 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 18 Aug 2015 19:42:04 +0000 Subject: [PATCH] Create group_vars for the bodhi2 prod nodes. --- inventory/group_vars/bodhi2 | 62 +++++++++++++++++++ .../host_vars/bodhi03.phx2.fedoraproject.org | 22 ------- .../host_vars/bodhi04.phx2.fedoraproject.org | 22 ------- 3 files changed, 62 insertions(+), 44 deletions(-) create mode 100644 inventory/group_vars/bodhi2 diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2 new file mode 100644 index 0000000000..11f40b6d6b --- /dev/null +++ b/inventory/group_vars/bodhi2 @@ -0,0 +1,62 @@ +--- +# 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 + +# 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: 2 +wsgi_threads: 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 + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- 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 + - bodhi.update.request.obsolete + - bodhi.update.request.revoke + - bodhi.update.request.stable + - bodhi.update.request.testing + - bodhi.update.request.unpush + + # 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 diff --git a/inventory/host_vars/bodhi03.phx2.fedoraproject.org b/inventory/host_vars/bodhi03.phx2.fedoraproject.org index ab390b8043..11791e8222 100644 --- a/inventory/host_vars/bodhi03.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi03.phx2.fedoraproject.org @@ -8,25 +8,3 @@ volgroup: /dev/vg_virthost01 eth0_ip: 10.5.126.115 vmhost: virthost01.phx2.fedoraproject.org datacenter: phx2 - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: root -- service: bodhi - owner: root - group: bodhi - can_send: - - bodhi.mashtask.mashing - - bodhi.mashtask.complete - - bodhi.mashtask.sync.wait - - bodhi.mashtask.sync.done - - bodhi.update.eject - - bodhi.update.complete.testing - - bodhi.update.complete.stable - - bodhi.update.request.testing - - bodhi.update.request.stable - - bodhi.update.comment - - bodhi.stack.save - - bodhi.stack.delete diff --git a/inventory/host_vars/bodhi04.phx2.fedoraproject.org b/inventory/host_vars/bodhi04.phx2.fedoraproject.org index 586c3afa22..9048b8c1fa 100644 --- a/inventory/host_vars/bodhi04.phx2.fedoraproject.org +++ b/inventory/host_vars/bodhi04.phx2.fedoraproject.org @@ -8,25 +8,3 @@ volgroup: /dev/vg_guests eth0_ip: 10.5.126.116 vmhost: virthost02.phx2.fedoraproject.org datacenter: phx2 - -# These are consumed by a task in roles/fedmsg/base/main.yml -fedmsg_certs: -- service: shell - owner: root - group: root -- service: bodhi - owner: root - group: bodhi - can_send: - - bodhi.mashtask.mashing - - bodhi.mashtask.complete - - bodhi.mashtask.sync.wait - - bodhi.mashtask.sync.done - - bodhi.update.eject - - bodhi.update.complete.testing - - bodhi.update.complete.stable - - bodhi.update.request.testing - - bodhi.update.request.stable - - bodhi.update.comment - - bodhi.stack.save - - bodhi.stack.delete