From aa337313beb03ce60dabaf73ee4004acddcba4bd Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 5 Oct 2018 05:13:41 +0000 Subject: [PATCH] Drop enabledrepos extra_repos for now. --- roles/ccsdb/tasks/main.yml | 2 +- roles/mariadb_server/tasks/main.yml | 4 ++-- roles/taskotron/buildmaster/tasks/main.yml | 8 ++++---- roles/taskotron/buildslave/tasks/main.yml | 4 ++-- roles/taskotron/execdb/tasks/main.yml | 2 +- roles/taskotron/grokmirror/tasks/main.yml | 4 ++-- roles/taskotron/imagefactory-client/tasks/main.yml | 2 +- roles/taskotron/imagefactory/tasks/main.yml | 2 +- roles/taskotron/resultsdb-backend/tasks/main.yml | 2 +- roles/taskotron/resultsdb-frontend/tasks/main.yml | 4 ++-- roles/taskotron/ssl-taskotron/tasks/main.yml | 4 ++-- roles/taskotron/taskotron-client/tasks/main.yml | 8 ++++---- roles/taskotron/taskotron-frontend/tasks/main.yml | 4 ++-- roles/taskotron/taskotron-master/tasks/main.yml | 2 +- roles/taskotron/taskotron-proxy/tasks/main.yml | 4 ++-- roles/taskotron/taskotron-trigger/tasks/main.yml | 4 ++-- roles/taskotron/vault/tasks/main.yml | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/roles/ccsdb/tasks/main.yml b/roles/ccsdb/tasks/main.yml index ad41f8ac65..d89b6699af 100644 --- a/roles/ccsdb/tasks/main.yml +++ b/roles/ccsdb/tasks/main.yml @@ -9,7 +9,7 @@ when: ansible_distribution_major_version|int < 22 - name: install ccsdb and its dependencies - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - ccsdb - mod_wsgi diff --git a/roles/mariadb_server/tasks/main.yml b/roles/mariadb_server/tasks/main.yml index d55658cef6..c297c2a399 100644 --- a/roles/mariadb_server/tasks/main.yml +++ b/roles/mariadb_server/tasks/main.yml @@ -1,12 +1,12 @@ - name: ensure packages required for mariadb are installed - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - mariadb-server - MySQL-python when: ansible_distribution_major_version|int < 22 - name: ensure packages required for mariadb are installed - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - mariadb-server - MySQL-python diff --git a/roles/taskotron/buildmaster/tasks/main.yml b/roles/taskotron/buildmaster/tasks/main.yml index e59a417e77..e268919177 100644 --- a/roles/taskotron/buildmaster/tasks/main.yml +++ b/roles/taskotron/buildmaster/tasks/main.yml @@ -3,7 +3,7 @@ service: name=httpd state=started - name: ensure packages required for buildmaster are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - buildbot - buildbot-master @@ -13,7 +13,7 @@ when: ansible_distribution_major_version|int < 22 - name: ensure packages required for buildmaster are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - buildbot - buildbot-master @@ -23,13 +23,13 @@ when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - name: ensure additional packages required for CI buildmaster are installed - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present when: ansible_distribution_major_version|int < 22 and (deployment_type == 'qa-prod' or deployment_type == 'qa-stg') with_items: - python-novaclient - name: ensure additional packages required for CI buildmaster are installed - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present when: ansible_distribution_major_version|int > 21 and (deployment_type == 'qa-prod' or deployment_type == 'qa-stg') with_items: - python-novaclient diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml index 2c79525438..12cff17fbf 100644 --- a/roles/taskotron/buildslave/tasks/main.yml +++ b/roles/taskotron/buildslave/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: ensure packages required for buildslave are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - buildbot-slave - git @@ -18,7 +18,7 @@ when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - name: ensure packages required for CI buildslave are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - testcloud - mash diff --git a/roles/taskotron/execdb/tasks/main.yml b/roles/taskotron/execdb/tasks/main.yml index 295cda6ed5..cb67845642 100644 --- a/roles/taskotron/execdb/tasks/main.yml +++ b/roles/taskotron/execdb/tasks/main.yml @@ -12,7 +12,7 @@ when: ansible_distribution_major_version|int < 22 - name: ensure packages required for execdb are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - execdb - mod_wsgi diff --git a/roles/taskotron/grokmirror/tasks/main.yml b/roles/taskotron/grokmirror/tasks/main.yml index 9d9877e1c3..825b243ed7 100644 --- a/roles/taskotron/grokmirror/tasks/main.yml +++ b/roles/taskotron/grokmirror/tasks/main.yml @@ -1,13 +1,13 @@ --- - name: ensure grokmirror packages are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - git - python-grokmirror when: ansible_distribution_major_version|int < 22 - name: ensure grokmirror packages are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - git - python-grokmirror diff --git a/roles/taskotron/imagefactory-client/tasks/main.yml b/roles/taskotron/imagefactory-client/tasks/main.yml index 70842b7362..e75136b55b 100644 --- a/roles/taskotron/imagefactory-client/tasks/main.yml +++ b/roles/taskotron/imagefactory-client/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: ensure packages required for imagefactory are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - python-libguestfs - libguestfs-tools diff --git a/roles/taskotron/imagefactory/tasks/main.yml b/roles/taskotron/imagefactory/tasks/main.yml index f987c17bc1..c36a5c6e81 100644 --- a/roles/taskotron/imagefactory/tasks/main.yml +++ b/roles/taskotron/imagefactory/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: ensure packages required for imagefactory are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - imagefactory - imagefactory-plugins diff --git a/roles/taskotron/resultsdb-backend/tasks/main.yml b/roles/taskotron/resultsdb-backend/tasks/main.yml index 3d225364d9..947957e5e7 100644 --- a/roles/taskotron/resultsdb-backend/tasks/main.yml +++ b/roles/taskotron/resultsdb-backend/tasks/main.yml @@ -12,7 +12,7 @@ - libsemanage-python - name: ensure packages required for resultsdb are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined with_items: - resultsdb diff --git a/roles/taskotron/resultsdb-frontend/tasks/main.yml b/roles/taskotron/resultsdb-frontend/tasks/main.yml index fc3ac0f10b..e12555e6d3 100644 --- a/roles/taskotron/resultsdb-frontend/tasks/main.yml +++ b/roles/taskotron/resultsdb-frontend/tasks/main.yml @@ -3,14 +3,14 @@ service: name=httpd state=started - name: ensure packages required for resultsdb_frontend are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present when: ansible_distribution_major_version|int < 22 with_items: - resultsdb_frontend - mod_wsgi - name: ensure packages required for resultsdb_frontend are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - resultsdb_frontend - mod_wsgi diff --git a/roles/taskotron/ssl-taskotron/tasks/main.yml b/roles/taskotron/ssl-taskotron/tasks/main.yml index eda8f96978..e9070f0fa0 100644 --- a/roles/taskotron/ssl-taskotron/tasks/main.yml +++ b/roles/taskotron/ssl-taskotron/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: ensure ssl related packages are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - mod_ssl when: ansible_distribution_major_version|int < 22 - name: ensure ssl related packages are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - mod_ssl when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml index 2c90225317..171d4ffb80 100644 --- a/roles/taskotron/taskotron-client/tasks/main.yml +++ b/roles/taskotron/taskotron-client/tasks/main.yml @@ -1,13 +1,13 @@ --- - name: ensure packages required for libtaskotron are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - PyYAML - libtaskotron when: deployment_type == 'local' - name: ensure packages required for libtaskotron are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - PyYAML - libtaskotron @@ -16,7 +16,7 @@ when: deployment_type in ['dev', 'stg', 'prod'] - name: ensure packages required for taskotron tasks are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - python-solv - python-librepo @@ -24,7 +24,7 @@ when: ansible_distribution_major_version|int < 22 - name: ensure packages required for taskotron tasks are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - python-solv - python-librepo diff --git a/roles/taskotron/taskotron-frontend/tasks/main.yml b/roles/taskotron/taskotron-frontend/tasks/main.yml index 8291824a30..9de3d81b50 100644 --- a/roles/taskotron/taskotron-frontend/tasks/main.yml +++ b/roles/taskotron/taskotron-frontend/tasks/main.yml @@ -1,12 +1,12 @@ --- - name: ensure packages required for taskotron-frontend are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - httpd when: ansible_distribution_major_version|int < 22 - name: ensure packages required for taskotron-frontend are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - httpd when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined diff --git a/roles/taskotron/taskotron-master/tasks/main.yml b/roles/taskotron/taskotron-master/tasks/main.yml index 25748479a3..5694cdd179 100644 --- a/roles/taskotron/taskotron-master/tasks/main.yml +++ b/roles/taskotron/taskotron-master/tasks/main.yml @@ -3,7 +3,7 @@ service: name=httpd state=started - name: ensure packages required for buildmaster are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - tmpwatch when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined diff --git a/roles/taskotron/taskotron-proxy/tasks/main.yml b/roles/taskotron/taskotron-proxy/tasks/main.yml index 26d079c203..d3f76dcb19 100644 --- a/roles/taskotron/taskotron-proxy/tasks/main.yml +++ b/roles/taskotron/taskotron-proxy/tasks/main.yml @@ -7,13 +7,13 @@ service: name=httpd state=started - name: ensure packages required for proxying are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - libsemanage-python when: ansible_distribution_major_version|int < 22 - name: ensure packages required for proxying are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - libsemanage-python when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined diff --git a/roles/taskotron/taskotron-trigger/tasks/main.yml b/roles/taskotron/taskotron-trigger/tasks/main.yml index 6e53991309..aa67c3119b 100644 --- a/roles/taskotron/taskotron-trigger/tasks/main.yml +++ b/roles/taskotron/taskotron-trigger/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: ensure packages required for taskotron-trigger are installed (yum) - package: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + package: name={{ item }} state=present with_items: - fedmsg - fedmsg-hub @@ -10,7 +10,7 @@ when: ansible_distribution_major_version|int < 22 - name: ensure packages required for taskotron-trigger are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - fedmsg - fedmsg-hub diff --git a/roles/taskotron/vault/tasks/main.yml b/roles/taskotron/vault/tasks/main.yml index b0e4ed6974..3420397143 100644 --- a/roles/taskotron/vault/tasks/main.yml +++ b/roles/taskotron/vault/tasks/main.yml @@ -12,7 +12,7 @@ when: ansible_distribution_major_version|int < 22 - name: ensure packages required for vault are installed (dnf) - dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }} + dnf: name={{ item }} state=present with_items: - vault - mod_wsgi