fix formatting of install directives so taskotron roles match other infra roles
This commit is contained in:
parent
82b6255157
commit
4abf07bc65
11 changed files with 33 additions and 23 deletions
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- buildbot
|
- buildbot
|
||||||
|
@ -7,7 +8,7 @@
|
||||||
- python-psycopg2
|
- python-psycopg2
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- buildbot
|
- buildbot
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- buildbot-slave
|
- buildbot-slave
|
||||||
|
@ -15,7 +16,7 @@
|
||||||
- moreutils
|
- moreutils
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- buildbot-slave
|
- buildbot-slave
|
||||||
|
|
|
@ -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
|
yum: name={{ item }} state=latest
|
||||||
when: deployment_type == 'prod' or deployment_type == 'local'
|
when: deployment_type == 'prod' or deployment_type == 'local'
|
||||||
with_items:
|
with_items:
|
||||||
|
@ -7,7 +8,7 @@
|
||||||
- python-psycopg2
|
- python-psycopg2
|
||||||
- libsemanage-python
|
- 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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- execdb
|
- execdb
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- git
|
- git
|
||||||
- python-grokmirror
|
- python-grokmirror
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- git
|
- git
|
||||||
|
|
|
@ -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
|
yum: name={{ item }} state=latest
|
||||||
when: deployment_type == 'prod' or deployment_type == 'local'
|
when: deployment_type == 'prod' or deployment_type == 'local'
|
||||||
with_items:
|
with_items:
|
||||||
|
@ -7,7 +8,7 @@
|
||||||
- python-psycopg2
|
- python-psycopg2
|
||||||
- libsemanage-python
|
- 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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
|
when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
|
||||||
with_items:
|
with_items:
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
when: deployment_type == 'prod' or deployment_type == 'local'
|
when: deployment_type == 'prod' or deployment_type == 'local'
|
||||||
with_items:
|
with_items:
|
||||||
- resultsdb_frontend
|
- resultsdb_frontend
|
||||||
- mod_wsgi
|
- 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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- resultsdb_frontend
|
- resultsdb_frontend
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- mod_ssl
|
- mod_ssl
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- mod_ssl
|
- mod_ssl
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- PyYAML
|
- PyYAML
|
||||||
|
@ -6,7 +7,7 @@
|
||||||
- resultsdb_api
|
- resultsdb_api
|
||||||
when: deployment_type == 'prod' or deployment_type == 'local'
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
when: deployment_type == 'dev' or deployment_type == 'stg'
|
when: deployment_type == 'dev' or deployment_type == 'stg'
|
||||||
with_items:
|
with_items:
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- httpd
|
- httpd
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- httpd
|
- httpd
|
||||||
|
|
|
@ -2,14 +2,14 @@
|
||||||
# this way, we can get away with a single ip and ssl cert instead of
|
# 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
|
# one for taskotron and one for resultsdb. The url scheme also stays
|
||||||
# closer to stg/prod
|
# 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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- libsemanage-python
|
- libsemanage-python
|
||||||
when: ansible_distribution_major_version|int < 22
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- libsemanage-python
|
- libsemanage-python
|
||||||
|
|
|
@ -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 }}
|
yum: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- fedmsg
|
- fedmsg
|
||||||
|
@ -8,7 +9,7 @@
|
||||||
- resultsdb_api
|
- resultsdb_api
|
||||||
when: deployment_type == 'prod' or deployment_type == 'local'
|
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 }}
|
dnf: name={{ item }} state=latest enablerepo={{ extra_enablerepos }}
|
||||||
with_items:
|
with_items:
|
||||||
- fedmsg
|
- fedmsg
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue