From a36c4a55affd234deab6870f9a90a0153a98162b Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Tue, 25 Apr 2017 18:47:16 +0000 Subject: [PATCH] Add pdc-backend03. --- inventory/group_vars/pdc-backend | 16 ++++++++++----- .../pdc-backend03.phx2.fedoraproject.org | 20 +++++++++++++++++++ .../pdc-backend03.stg.phx2.fedoraproject.org | 20 +++++++++++++++++++ inventory/inventory | 3 +++ roles/pdc/backend/templates/pdcupdater.py | 11 +++++----- 5 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 inventory/host_vars/pdc-backend03.phx2.fedoraproject.org create mode 100644 inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org diff --git a/inventory/group_vars/pdc-backend b/inventory/group_vars/pdc-backend index b1b47b192f..987995e717 100644 --- a/inventory/group_vars/pdc-backend +++ b/inventory/group_vars/pdc-backend @@ -19,8 +19,8 @@ csi_security_category: Moderate csi_primary_contact: Ralph Bean csi_purpose: fedmsg-hub daemon that ferries data from fedmsg to PDC. csi_relationship: | - NOTICE - pdc-backend01 and pdc-backend02 do *different* things. They both run - a fedmsg-hub daemon that loads the pdc-updater consumer plugin. However, the + NOTICE - The three pdc-backend do *different* things. They all run a + fedmsg-hub daemon that loads the pdc-updater consumer plugin. However, the pdc-updater plugin is configured to do different things in each place. On pdc-updater01, the compose handler is enabled which listens for new pungi @@ -28,6 +28,12 @@ csi_relationship: | has only a single thread enabled to avoid OOMing itself with more than one compose at a time. - On pdc-updater02, the dep chain and modularity handlers are enabled which - listen for koji and MBS activity, and store that in PDC. Multiple threads - are enabled so that it can work more efficiently on these smaller tasks. + On pdc-updater02, the modularity handlers are enabled which listen for MBS + activity, and store that in PDC. Multiple threads are enabled so that it can + work more efficiently on these smaller tasks. + + On pdc-updater03, the dep chain handlers are enabled which listen for koji + messages and store dep chain information in PDC, like what rpms depend on what + other rpms at build time, and what containers depend on what rpms, etc.. + Multiple threads are enabled so that it can work more efficiently on these + smaller tasks. diff --git a/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org new file mode 100644 index 0000000000..5f69d64486 --- /dev/null +++ b/inventory/host_vars/pdc-backend03.phx2.fedoraproject.org @@ -0,0 +1,20 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.21 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ + +eth0_ip: 10.5.126.242 + +volgroup: /dev/vg_guests +vmhost: virthost22.phx2.fedoraproject.org +datacenter: phx2 + +# These people get told when something goes wrong. +fedmsg_error_recipients: +- ralph@fedoraproject.org +- mprahl@redhat.com +- jkaluza@redhat.com +- fvalder@redhat.com diff --git a/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org b/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org new file mode 100644 index 0000000000..721aff3b87 --- /dev/null +++ b/inventory/host_vars/pdc-backend03.stg.phx2.fedoraproject.org @@ -0,0 +1,20 @@ +--- +nm: 255.255.255.0 +gw: 10.5.126.254 +dns: 10.5.126.21 + +ks_url: http://10.5.126.23/repo/rhel/ks/kvm-rhel-7 +ks_repo: http://10.5.126.23/repo/rhel/RHEL7-x86_64/ + +eth0_ip: 10.5.126.243 + +volgroup: /dev/vg_guests +vmhost: virthost20.phx2.fedoraproject.org +datacenter: phx2 + +# These people get told when something goes wrong. +fedmsg_error_recipients: +- ralph@fedoraproject.org +- mprahl@redhat.com +- jkaluza@redhat.com +- fvalder@redhat.com diff --git a/inventory/inventory b/inventory/inventory index 06d7bf3d6d..cacba691b4 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -747,6 +747,7 @@ nuancier02.stg.phx2.fedoraproject.org packages03.stg.phx2.fedoraproject.org pdc-backend01.stg.phx2.fedoraproject.org pdc-backend02.stg.phx2.fedoraproject.org +pdc-backend03.stg.phx2.fedoraproject.org pdc-web01.stg.phx2.fedoraproject.org pgbdr01.stg.phx2.fedoraproject.org pgbdr02.stg.phx2.fedoraproject.org @@ -1081,10 +1082,12 @@ pdc-web01.stg.phx2.fedoraproject.org [pdc-backend] pdc-backend01.phx2.fedoraproject.org pdc-backend02.phx2.fedoraproject.org +pdc-backend03.phx2.fedoraproject.org [pdc-backend-stg] pdc-backend01.stg.phx2.fedoraproject.org pdc-backend02.stg.phx2.fedoraproject.org +pdc-backend03.stg.phx2.fedoraproject.org [piwik-stg] #piwik01.stg.phx2.fedoraproject.org diff --git a/roles/pdc/backend/templates/pdcupdater.py b/roles/pdc/backend/templates/pdcupdater.py index 963215cb64..d140555d01 100644 --- a/roles/pdc/backend/templates/pdcupdater.py +++ b/roles/pdc/backend/templates/pdcupdater.py @@ -68,17 +68,16 @@ config = { {% if inventory_hostname.startswith('pdc-backend01') %} 'pdcupdater.handlers.compose:NewComposeHandler', {% elif inventory_hostname.startswith('pdc-backend02') %} - # Disable these for now as they clog up the queue for the MBS handler + # For MBS https://fedoraproject.org/wiki/Changes/ModuleBuildService + 'pdcupdater.handlers.modules:ModuleStateChangeHandler', + {% elif inventory_hostname.startswith('pdc-backend03') %} ## https://fedoraproject.org/wiki/User:Ralph/Drafts/Infrastructure/Factory2/ModellingDeps #'pdcupdater.handlers.depchain.rpms:NewRPMBuildTimeDepChainHandler', #'pdcupdater.handlers.depchain.rpms:NewRPMRunTimeDepChainHandler', - - # For MBS https://fedoraproject.org/wiki/Changes/ModuleBuildService - 'pdcupdater.handlers.modules:ModuleStateChangeHandler', - + 'pdcupdater.handlers.depchain.containers:ContainerRPMInclusionDepChainHandler', + {% endif %} # This just isn't used for now.. but we can re-enable it if we need it. #'pdcupdater.handlers.atomic:AtomicComponentGroupHandler', - {% endif %} ], 'logging': dict(