From 7a821d314f2d790c38806374e6b0b74cecb73a8b Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Jul 31 2020 06:05:39 +0000
Subject: ODCS: Move releng composes from odcs-backend back to odcs-backend-releng.


---

diff --git a/inventory/group_vars/odcs_backend b/inventory/group_vars/odcs_backend
index f413883..2fa64ac 100644
--- a/inventory/group_vars/odcs_backend
+++ b/inventory/group_vars/odcs_backend
@@ -60,5 +60,3 @@ csi_relationship: |
 
 nagios_Check_Services:
   odcs-celery-backend: true
-
-odcs_celery_queues: ["releng_raw_pungi_composes", "releng_pungi_composes", "cleanup", "eln_raw_pungi_composes", "cccc_raw_pungi_composes", "pungi_composes"]
diff --git a/roles/odcs/backend/tasks/main.yml b/roles/odcs/backend/tasks/main.yml
index d3db7b5..ee07007 100644
--- a/roles/odcs/backend/tasks/main.yml
+++ b/roles/odcs/backend/tasks/main.yml
@@ -208,19 +208,19 @@
     owner: odcs-server
     group: odcs-server
     mode: 0640
-  when: inventory_hostname.startswith('odcs-backend01')
+  when: inventory_hostname.startswith('odcs-backend-releng')
 
 - name: set releng odcs oidc token
   copy:
     src: "{{private}}/files/releng/{{env}}/releng-odcs-oidc-token"
     dest: /etc/releng-odcs-oidc-token
-  when: inventory_hostname.startswith('odcs-backend01')
+  when: inventory_hostname.startswith('odcs-backend-releng')
 
 - name: Set MAILTO cronvar
   cronvar:
     name: MAILTO
     value: releng-cron@lists.fedoraproject.org
-  when: inventory_hostname.startswith('odcs-backend01')
+  when: inventory_hostname.startswith('odcs-backend-releng')
 
 
 - name: Set cronjob to execute ELN periodic compose
@@ -228,4 +228,4 @@
     name: "ELN periodic compose"
     minute: "0"
     job: "odcs --token=/etc/releng-odcs-oidc-token create-raw-config --compose-type=production --label=Alpha-0.1 eln eln"
-  when: inventory_hostname.startswith('odcs-backend01')
+  when: inventory_hostname.startswith('odcs-backend-releng')
diff --git a/roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2 b/roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2
index dab93fd..4db0e84 100644
--- a/roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2
+++ b/roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2
@@ -5,7 +5,7 @@ topurl = https://kojipkgs.fedoraproject.org/
 authtype = kerberos
 krb_rdns = false
 
-{% if inventory_hostname.startswith('odcs-backend01') %}
+{% if inventory_hostname.startswith('odcs-backend-releng') %}
 principal = releng@FEDORAPROJECT.ORG
 keytab = /etc/krb5.releng.keytab
 {% endif  %}