From 04731f27f310cbc341749e8d85b818e6d8fae0de Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 1/8] nagios_server: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml index 2d6d50c..e2d5dde 100644 --- a/roles/nagios_server/tasks/main.yml +++ b/roles/nagios_server/tasks/main.yml @@ -22,41 +22,43 @@ ## Install the initial packages for the group. - name: Install nagios packages - package: name={{ item }} state=present - with_items: - - php - - nagios.x86_64 - - nagios-selinux - - nrpe-selinux - - nagios-plugins - - nagios-plugins-dig - - nagios-plugins-disk - - nagios-plugins-dns - - nagios-plugins-dummy - - nagios-plugins-file_age - - nagios-plugins-http - - nagios-plugins-load - - nagios-plugins-nagios - - nagios-plugins-nrpe - - nagios-plugins-perl - - nagios-plugins-pgsql - - nagios-plugins-ping - - nagios-plugins-procs - - nagios-plugins-smtp - - nagios-plugins-ssh - - nagios-plugins-swap - - nagios-plugins-tcp - - nagios-plugins-users - - perl-Mail-IMAPClient - - stunnel - - mod_auth_gssapi - tags: - - nagios_server - + package: + state: present + name: + - php + - nagios.x86_64 + - nagios-selinux + - nrpe-selinux + - nagios-plugins + - nagios-plugins-dig + - nagios-plugins-disk + - nagios-plugins-dns + - nagios-plugins-dummy + - nagios-plugins-file_age + - nagios-plugins-http + - nagios-plugins-load + - nagios-plugins-nagios + - nagios-plugins-nrpe + - nagios-plugins-perl + - nagios-plugins-pgsql + - nagios-plugins-ping + - nagios-plugins-procs + - nagios-plugins-smtp + - nagios-plugins-ssh + - nagios-plugins-swap + - nagios-plugins-tcp + - nagios-plugins-users + - perl-Mail-IMAPClient + - stunnel + - mod_auth_gssapi + tags: + - nagios_server + - name: Install the SSL apache module - package: name={{ item }} state=present - with_items: - - mod_ssl + package: + state: present + name: + - mod_ssl when: env == "production" and nagios_location == "external" From 55fc7b75febc32867ae8f9cfb017cf45115ade4a Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 2/8] fedocal: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/fedocal/tasks/main.yml b/roles/fedocal/tasks/main.yml index 1e65805..a83b199 100644 --- a/roles/fedocal/tasks/main.yml +++ b/roles/fedocal/tasks/main.yml @@ -2,14 +2,15 @@ # Configuration for the fedocal webapp - name: install needed packages - package: name={{ item }} state=present - with_items: - - fedocal - - python-psycopg2 - - python-openid-cla - - python-openid-teams - - python-memcached - - libsemanage-python + package: + state: present + name: + - fedocal + - python-psycopg2 + - python-openid-cla + - python-openid-teams + - python-memcached + - libsemanage-python tags: - packages From 472d948e2a2816dd6402a563a0db1ddec7671df5 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 3/8] fedora-web: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/fedora-web/build/tasks/main.yml b/roles/fedora-web/build/tasks/main.yml index a101ab5..16a4a74 100644 --- a/roles/fedora-web/build/tasks/main.yml +++ b/roles/fedora-web/build/tasks/main.yml @@ -1,20 +1,22 @@ - name: Install needed packages - package: name={{ item }} state=present - with_items: - - babel - - git - - python-feedparser - - python-genshi - - python-setuptools - - zanata-python-client + package: + state: present + name: + - babel + - git + - python-feedparser + - python-genshi + - python-setuptools + - zanata-python-client tags: - packages - fedora-web - name: Install extra packages for staging - package: name={{ item }} state=present - with_items: - - python-dogpile-cache + package: + state: present + name: + - python-dogpile-cache tags: - packages - fedora-web From 7a074e3ebd8743b21b5c04ba8e5a3e12506e0699 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 4/8] rabbitmq_cluster: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml index e21cc5d..8d96f43 100644 --- a/roles/rabbitmq_cluster/tasks/main.yml +++ b/roles/rabbitmq_cluster/tasks/main.yml @@ -8,10 +8,11 @@ - yumrepos - name: install needed packages - package: name={{ item }} state=present - with_items: - - rabbitmq-server - - nagios-plugins-rabbitmq + package: + state: present + name: + - rabbitmq-server + - nagios-plugins-rabbitmq tags: - rabbitmq_cluster - packages From 39ca560aa4e0347c380d22214f7cf4c00c2d9d6a Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 5/8] bz_review_report: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/bz_review_report/tasks/main.yml b/roles/bz_review_report/tasks/main.yml index b9d6452..5116d4f 100644 --- a/roles/bz_review_report/tasks/main.yml +++ b/roles/bz_review_report/tasks/main.yml @@ -3,9 +3,10 @@ ## Install packages - name: Install needed packages - package: name={{ item }} state=present - with_items: - - python-bugzilla + package: + state: present + name: + - python-bugzilla tags: - packages From 5f165f66f8eaf5a4a3c981ebf8356c111fd1e55e Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 6/8] mbs: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/mbs/common/tasks/main.yml b/roles/mbs/common/tasks/main.yml index 97f6017..875fdc5 100644 --- a/roles/mbs/common/tasks/main.yml +++ b/roles/mbs/common/tasks/main.yml @@ -2,12 +2,13 @@ # Common configuration for the Module Build Service (MBS) pieces - name: install needed packages - package: name={{ item }} state=present - with_items: - - module-build-service - - python-psycopg2 - - libsemanage-python - - python-memcached + package: + state: present + name: + - module-build-service + - python-psycopg2 + - libsemanage-python + - python-memcached notify: - restart apache - restart fedmsg-hub From 9a3ae7664ed42cebce2a201aeb32df9e0bd092c2 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 7/8] freemedia: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/freemedia/tasks/main.yml b/roles/freemedia/tasks/main.yml index add38d5..595f61e 100644 --- a/roles/freemedia/tasks/main.yml +++ b/roles/freemedia/tasks/main.yml @@ -2,9 +2,10 @@ # Tasklist for setting up freemedia cgi. - name: install needed php packages - package: name={{ item }} state=present - with_items: - - php + package: + state: present + name: + - php notify: - reload httpd tags: From 1a543b0840b1d7da5ab8f2a36644627532e41a0d Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Jun 11 2019 15:51:16 +0000 Subject: [PATCH 8/8] git/hooks: update package command to not use items Signed-off-by: Aurélien Bompard --- diff --git a/roles/git/hooks/tasks/main.yml b/roles/git/hooks/tasks/main.yml index bfb2dd0..0254e80 100644 --- a/roles/git/hooks/tasks/main.yml +++ b/roles/git/hooks/tasks/main.yml @@ -2,20 +2,23 @@ # tasklist for setting up git mail hooks - name: install needed packages - package: name={{item}} state=present - with_items: - - git - - moreutils - - python-kitchen + package: + state: present + name: + - git + - moreutils + - python-kitchen tags: - git - git/hooks - packages - name: install needed packages from epel testing - package: name={{item}} state=present enablerepo=epel-testing - with_items: - - python-pygit2 + yum: + state: present + enablerepo: epel-testing + name: + - python-pygit2 tags: - git - git/hooks