From 4abf07bc656a1255981ad217b2b51cc7ba3de321 Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Thu, 1 Oct 2015 19:15:30 +0000
Subject: [PATCH] fix formatting of install directives so taskotron roles match
 other infra roles

---
 roles/taskotron/buildmaster/tasks/main.yml        | 5 +++--
 roles/taskotron/buildslave/tasks/main.yml         | 5 +++--
 roles/taskotron/execdb/tasks/main.yml             | 5 +++--
 roles/taskotron/grokmirror/tasks/main.yml         | 5 +++--
 roles/taskotron/resultsdb-backend/tasks/main.yml  | 5 +++--
 roles/taskotron/resultsdb-frontend/tasks/main.yml | 5 +++--
 roles/taskotron/ssl-taskotron/tasks/main.yml      | 5 +++--
 roles/taskotron/taskotron-client/tasks/main.yml   | 5 +++--
 roles/taskotron/taskotron-frontend/tasks/main.yml | 5 +++--
 roles/taskotron/taskotron-proxy/tasks/main.yml    | 6 +++---
 roles/taskotron/taskotron-trigger/tasks/main.yml  | 5 +++--
 11 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml
index ecde63cb8e..8062fc9cfe 100644
--- a/roles/taskotron/buildmaster/tasks/main.yml
+++ b/roles/taskotron/buildmaster/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for buildmaster are installed
+---
+- name: ensure packages required for buildmaster are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - buildbot
@@ -7,7 +8,7 @@
     - python-psycopg2
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure packages required for buildmaster are installed
+- name: ensure packages required for buildmaster are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - buildbot
diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml
index 1c5ed49b71..da8b0622b4 100644
--- a/roles/taskotron/buildslave/tasks/main.yml
+++ b/roles/taskotron/buildslave/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for buildslave are installed
+---
+- name: ensure packages required for buildslave are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - buildbot-slave
@@ -15,7 +16,7 @@
     - moreutils
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure packages required for buildslave are installed (f22+)
+- name: ensure packages required for buildslave are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - buildbot-slave
diff --git a/roles/taskotron/execdb/tasks/main.yml b/roles/taskotron/execdb/tasks/main.yml
index 2ff3e0cc85..1eb888a6cd 100644
--- a/roles/taskotron/execdb/tasks/main.yml
+++ b/roles/taskotron/execdb/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for execdb are installed
+---
+- name: ensure packages required for execdb are installed (yum)
   yum: name={{ item }} state=latest
   when: deployment_type == 'prod' or deployment_type == 'local'
   with_items:
@@ -7,7 +8,7 @@
     - python-psycopg2
     - libsemanage-python
 
-- name: ensure packages required for execdb are installed (f22+)
+- name: ensure packages required for execdb are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - execdb
diff --git a/roles/taskotron/grokmirror/tasks/main.yml b/roles/taskotron/grokmirror/tasks/main.yml
index 6cfa7754c9..7f61995aa4 100644
--- a/roles/taskotron/grokmirror/tasks/main.yml
+++ b/roles/taskotron/grokmirror/tasks/main.yml
@@ -1,11 +1,12 @@
-- name: ensure grokmirror packages are installed
+---
+- name: ensure grokmirror packages are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
       - git
       - python-grokmirror
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure grokmirror packages are installed
+- name: ensure grokmirror packages are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
       - git
diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml
index 1de8c466f1..5e1e181087 100644
--- a/roles/taskotron/resultsdb-backend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-backend/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for resultsdb are installed
+---
+- name: ensure packages required for resultsdb are installed (yum)
   yum: name={{ item }} state=latest
   when: deployment_type == 'prod' or deployment_type == 'local'
   with_items:
@@ -7,7 +8,7 @@
     - python-psycopg2
     - libsemanage-python
 
-- name: ensure packages required for resultsdb are installed (infra-testing)
+- name: ensure packages required for resultsdb are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
   with_items:
diff --git a/roles/taskotron/resultsdb-frontend/tasks/main.yml b/roles/taskotron/resultsdb-frontend/tasks/main.yml
index 1f232c7f77..1381814ae3 100644
--- a/roles/taskotron/resultsdb-frontend/tasks/main.yml
+++ b/roles/taskotron/resultsdb-frontend/tasks/main.yml
@@ -1,11 +1,12 @@
-- name: ensure packages required for resultsdb_frontend are installed
+---
+- name: ensure packages required for resultsdb_frontend are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   when: deployment_type == 'prod' or deployment_type == 'local'
   with_items:
     - resultsdb_frontend
     - mod_wsgi
 
-- name: ensure packages required for resultsdb_frontend are installed (f22+)
+- name: ensure packages required for resultsdb_frontend are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - resultsdb_frontend
diff --git a/roles/taskotron/ssl-taskotron/tasks/main.yml b/roles/taskotron/ssl-taskotron/tasks/main.yml
index e42cced641..80826c02de 100644
--- a/roles/taskotron/ssl-taskotron/tasks/main.yml
+++ b/roles/taskotron/ssl-taskotron/tasks/main.yml
@@ -1,10 +1,11 @@
-- name: ensure ssl related packages are installed
+---
+- name: ensure ssl related packages are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
       - mod_ssl
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure ssl related packages are installed
+- name: ensure ssl related packages are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
       - mod_ssl
diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml
index a77557cd1e..4be57f9782 100644
--- a/roles/taskotron/taskotron-client/tasks/main.yml
+++ b/roles/taskotron/taskotron-client/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for libtaskotron are installed
+---
+- name: ensure packages required for libtaskotron are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - PyYAML
@@ -6,7 +7,7 @@
     - resultsdb_api
   when: deployment_type == 'prod' or deployment_type == 'local'
 
-- name: ensure packages required for libtaskotron are installed (f22+)
+- name: ensure packages required for libtaskotron are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   when: deployment_type == 'dev' or deployment_type == 'stg'
   with_items:
diff --git a/roles/taskotron/taskotron-frontend/tasks/main.yml b/roles/taskotron/taskotron-frontend/tasks/main.yml
index 3275a9239a..a5652d6360 100644
--- a/roles/taskotron/taskotron-frontend/tasks/main.yml
+++ b/roles/taskotron/taskotron-frontend/tasks/main.yml
@@ -1,10 +1,11 @@
-- name: ensure packages required for taskotron-frontend are installed
+---
+- name: ensure packages required for taskotron-frontend are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - httpd
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure packages required for taskotron-frontend are installed (f22+)
+- name: ensure packages required for taskotron-frontend are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - httpd
diff --git a/roles/taskotron/taskotron-proxy/tasks/main.yml b/roles/taskotron/taskotron-proxy/tasks/main.yml
index bc0a34dd62..0221d87ea3 100644
--- a/roles/taskotron/taskotron-proxy/tasks/main.yml
+++ b/roles/taskotron/taskotron-proxy/tasks/main.yml
@@ -2,14 +2,14 @@
 # this way, we can get away with a single ip and ssl cert instead of
 # one for taskotron and one for resultsdb. The url scheme also stays
 # closer to stg/prod
-
-- name: ensure packages required for proxying are installedc
+---
+- name: ensure packages required for proxying are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - libsemanage-python
   when: ansible_distribution_major_version|int < 22
 
-- name: ensure packages required for proxying are installedc
+- name: ensure packages required for proxying are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - libsemanage-python
diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml
index 09fe8ee50d..81c65ff402 100644
--- a/roles/taskotron/taskotron-trigger/tasks/main.yml
+++ b/roles/taskotron/taskotron-trigger/tasks/main.yml
@@ -1,4 +1,5 @@
-- name: ensure packages required for taskotron-trigger are installed
+---
+- name: ensure packages required for taskotron-trigger are installed (yum)
   yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - fedmsg
@@ -8,7 +9,7 @@
     - resultsdb_api
   when: deployment_type == 'prod' or deployment_type == 'local'
 
-- name: ensure packages required for taskotron-trigger are installed (infra-testing)
+- name: ensure packages required for taskotron-trigger are installed (dnf)
   dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
   with_items:
     - fedmsg