From b223fc77a1de41bfe220997bc7ea3ba56277c121 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Wed, 3 Jun 2020 09:55:08 -0400
Subject: [PATCH] fmc is now buildable in infra repos

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 playbooks/groups/odcs.yml | 49 +++++++++------------------------------
 roles/fmc/tasks/main.yml  | 20 ++++++----------
 2 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml
index 957ee3fcd6..4cd16feae6 100644
--- a/playbooks/groups/odcs.yml
+++ b/playbooks/groups/odcs.yml
@@ -84,44 +84,6 @@
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
 
-- name: Set up odcs backend service
-  hosts: odcs_backend:odcs_backend_stg
-  user: root
-  gather_facts: True
-
-  vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
-
-  roles:
-  - role: odcs/backend
-  - role: fedmsg/base
-    when: not inventory_hostname.startswith('odcs-backend-releng01')
-  - role: keytab/service
-    service: odcs
-    owner_user: odcs
-    owner_group: odcs
-    host: "odcs{{env_suffix}}.fedoraproject.org"
-  # keytab for odcs releng backend
-  - role: keytab/service
-    service: odcs
-    host: "odcs-backend-releng01.phx2.fedoraproject.org"
-  - role: rabbit/user
-    username: "fmc{{ env_suffix }}"
-  - role: rabbit/queue
-    username: "fmc{{ env_suffix }}"
-    queue_name: "{{ fmc_queue_name }}"
-    routing_keys: "{{ fmc_routing_keys }}"
-    thresholds:
-      warning: 100
-      critical: 1000
-  - role: fmc
-    host: "odcs-backend-releng01.phx2.fedoraproject.org"
-
-  handlers:
-  - import_tasks: "{{ handlers_path }}/restart_services.yml"
-
 - name: Set up /mnt/koji on both the frontend and backend
   hosts: odcs:odcs_stg
   user: root
@@ -185,6 +147,17 @@
   - role: keytab/service
     service: odcs
     host: "odcs-backend-releng01.iad2.fedoraproject.org"
+  - role: rabbit/user
+    username: "fmc{{ env_suffix }}"
+  - role: rabbit/queue
+    username: "fmc{{ env_suffix }}"
+    queue_name: "{{ fmc_queue_name }}"
+    routing_keys: "{{ fmc_routing_keys }}"
+    thresholds:
+      warning: 100
+      critical: 1000
+  - role: fmc
+    host: "odcs-backend-releng01.iad2.fedoraproject.org"
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/fmc/tasks/main.yml b/roles/fmc/tasks/main.yml
index 78a04030a1..11a6bc7de0 100644
--- a/roles/fmc/tasks/main.yml
+++ b/roles/fmc/tasks/main.yml
@@ -1,17 +1,11 @@
 ---
-- name: Copy fedora-minimal-compose.py to python site-packages
-  get_url:
-    url: https://pagure.io/releng/fmc/raw/master/f/fedora-minimal-compose.py
-    dest: /usr/lib/python3.7/site-packages/
-    mode: '0755'
-  when: inventory_hostname.startswith('odcs-backend-releng')
-  tags:
-  - fmc
-
-- name: Install fedora-messaging rpm
-  dnf:
-    package: fedora-messaging
-    state: latest
+- name: Install fmc and fedora-messaging rpm
+  package:
+    name:
+      - fedora-messaging
+      # fmc rpm is built in infra tags
+      - fmc
+    state: present
   when: inventory_hostname.startswith('odcs-backend-releng')
   tags:
   - fmc