From 7a67ba48d2f9b88047894568f6018c3575aa546e Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Thu, 9 Aug 2018 18:52:55 +0200 Subject: [PATCH] Refactor: change 'state=installed' with 'state=present' everywhere. --- .../tasks/dnet-additional-packages.yml | 2 +- drupal-org/tasks/drupal-main.yml | 2 +- fail2ban/tasks/fail2ban.yml | 2 +- ganglia/tasks/main.yml | 8 ++++---- jetty-apache/tasks/apache.yml | 2 +- jetty-apache/tasks/jetty.yml | 2 +- jetty/tasks/jetty.yml | 4 ++-- mongodb/tasks/main.yml | 2 +- nagios-nrpe-tomcat/tasks/main.yml | 2 +- nagios/tasks/dell-omsa.yml | 6 +++--- nagios/tasks/hardware-checks.yml | 2 +- nagios/tasks/nagios.yml | 4 ++-- nagios/tasks/nsca.yml | 4 ++-- nagios/tasks/postgresql-nagios.yml | 2 +- postfix-relay/tasks/postfix-relay-server.yml | 2 +- redmine/tasks/base-packages-old-gems.yml | 2 +- redmine/tasks/base-packages.yml | 2 +- redmine/tasks/redmine.yml | 2 +- tomcat-apache-requirements/tasks/packages.yml | 4 ++-- tomcat/tasks/pgsql_jdbc.yml | 2 +- vsftpd/tasks/main.yml | 2 +- 21 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dnet_user_services_perms/tasks/dnet-additional-packages.yml b/dnet_user_services_perms/tasks/dnet-additional-packages.yml index 00fb659d..f5cb5dc7 100644 --- a/dnet_user_services_perms/tasks/dnet-additional-packages.yml +++ b/dnet_user_services_perms/tasks/dnet-additional-packages.yml @@ -1,6 +1,6 @@ --- - name: Install additional packages, if needed - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: '{{ dnet_additional_packages | default ([]) }}' tags: ['dnet', 'pkgs'] diff --git a/drupal-org/tasks/drupal-main.yml b/drupal-org/tasks/drupal-main.yml index 3bc2229d..7ca886f4 100644 --- a/drupal-org/tasks/drupal-main.yml +++ b/drupal-org/tasks/drupal-main.yml @@ -18,7 +18,7 @@ tags: drupal - name: Install the drupal deb package - apt: name=drupal state=installed + apt: name=drupal state=present when: drupal_install_deb tags: [ 'drupal', 'drupal_deb' ] diff --git a/fail2ban/tasks/fail2ban.yml b/fail2ban/tasks/fail2ban.yml index e68c3758..74e76d76 100644 --- a/fail2ban/tasks/fail2ban.yml +++ b/fail2ban/tasks/fail2ban.yml @@ -1,6 +1,6 @@ --- - name: Install fail2ban on ubuntu >= 14.04 and debian >= 8 - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: '{{ f2b_packages }}' tags: fail2ban diff --git a/ganglia/tasks/main.yml b/ganglia/tasks/main.yml index b38e05d8..e8ac1167 100644 --- a/ganglia/tasks/main.yml +++ b/ganglia/tasks/main.yml @@ -1,12 +1,12 @@ --- - block: - name: Install the ganglia client - apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=3600 + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=3600 with_items: - ganglia-monitor - name: Install the ganglia linux specific plugins. We need at least ubuntu trusty. Or debian 7. Or debian 8 - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - ganglia-modules-linux - ganglia-monitor-python @@ -14,7 +14,7 @@ when: is_trusty - name: Install the ganglia linux specific plugins. We need at least ubuntu trusty. Or debian 7. Or debian 8 - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - ganglia-modules-linux - ganglia-monitor-python @@ -22,7 +22,7 @@ when: is_debian7 - name: Install the ganglia linux specific plugins. We need at least ubuntu trusty. Or debian 7. Or debian 8 - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - ganglia-modules-linux - ganglia-monitor-python diff --git a/jetty-apache/tasks/apache.yml b/jetty-apache/tasks/apache.yml index 776959eb..7ced3d7b 100644 --- a/jetty-apache/tasks/apache.yml +++ b/jetty-apache/tasks/apache.yml @@ -1,6 +1,6 @@ --- - name: Install the apache packages - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - apache2 - apache2-mpm-prefork diff --git a/jetty-apache/tasks/jetty.yml b/jetty-apache/tasks/jetty.yml index ec14fd90..b8ff5244 100644 --- a/jetty-apache/tasks/jetty.yml +++ b/jetty-apache/tasks/jetty.yml @@ -1,6 +1,6 @@ --- - name: Install the jetty packages - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - jetty - libapache2-mod-jk diff --git a/jetty/tasks/jetty.yml b/jetty/tasks/jetty.yml index bbb248dd..9eaf4c9f 100644 --- a/jetty/tasks/jetty.yml +++ b/jetty/tasks/jetty.yml @@ -1,6 +1,6 @@ --- - name: Install the jetty packages - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - jetty tags: @@ -13,7 +13,7 @@ - jetty - name: Install the apache mod_jk module, if needed - apt: pkg={{ item }} state=installed force=yes + apt: pkg={{ item }} state=present force=yes with_items: - libapache2-mod-jk when: jetty_use_apache is defined and jetty_use_apache diff --git a/mongodb/tasks/main.yml b/mongodb/tasks/main.yml index 35bbe9a9..1c6df356 100644 --- a/mongodb/tasks/main.yml +++ b/mongodb/tasks/main.yml @@ -38,7 +38,7 @@ tags: mongodb - name: Install the mongodb server - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - mongodb-server when: diff --git a/nagios-nrpe-tomcat/tasks/main.yml b/nagios-nrpe-tomcat/tasks/main.yml index 6b6ffb9b..3c56456f 100644 --- a/nagios-nrpe-tomcat/tasks/main.yml +++ b/nagios-nrpe-tomcat/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install the plugin dependencies - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: check_tomcat_deps tags: - nagios diff --git a/nagios/tasks/dell-omsa.yml b/nagios/tasks/dell-omsa.yml index 27c462e6..c1cf1751 100644 --- a/nagios/tasks/dell-omsa.yml +++ b/nagios/tasks/dell-omsa.yml @@ -33,12 +33,12 @@ tags: [ 'dell', 'nagios' ] - name: Install the Dell OMSA packages dependencies - apt: pkg={{ item }} state=installed force=yes update_cache=yes cache_valid_time=1800 + apt: pkg={{ item }} state=present force=yes update_cache=yes cache_valid_time=1800 with_items: '{{ nagios_dell_omsa_deps }}' tags: [ 'dell', 'nagios' ] - name: Install other Dell OMSA packages dependencies - apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800 + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 with_items: - python-requests register: requests_pkg @@ -46,7 +46,7 @@ tags: [ 'dell', 'nagios' ] - name: Install the python-pip package if requests is not available as a package - apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800 + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 with_items: - python-pip when: requests_pkg|failed diff --git a/nagios/tasks/hardware-checks.yml b/nagios/tasks/hardware-checks.yml index b392c2d1..0f2b34e7 100644 --- a/nagios/tasks/hardware-checks.yml +++ b/nagios/tasks/hardware-checks.yml @@ -9,7 +9,7 @@ - nagios - name: Install some packages needed by the hardware checks - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - smartmontools tags: diff --git a/nagios/tasks/nagios.yml b/nagios/tasks/nagios.yml index c8ae102e..e35c053e 100644 --- a/nagios/tasks/nagios.yml +++ b/nagios/tasks/nagios.yml @@ -1,11 +1,11 @@ --- - name: Install the nagios packages - apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800 + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 with_items: '{{ nagios_plugins_base_pkgs }}' tags: nagios - name: Additional nagios plugins when available - apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800 + apt: pkg={{ item }} state=present update_cache=yes cache_valid_time=1800 with_items: '{{ nagios_plugins_contrib }}' tags: [ 'nagios', 'nagios_plug_contrib' ] diff --git a/nagios/tasks/nsca.yml b/nagios/tasks/nsca.yml index 626ef2e0..96d09be8 100644 --- a/nagios/tasks/nsca.yml +++ b/nagios/tasks/nsca.yml @@ -4,14 +4,14 @@ tags: - nsca -- apt: pkg={{ item }} state=installed +- apt: pkg={{ item }} state=present with_items: - nsca-client when: '(({{ is_not_ubuntu_less_than_precise }}) == True) or (({{ is_debian7 }}) == True)' tags: - nsca -- apt: pkg={{ item }} state=installed +- apt: pkg={{ item }} state=present with_items: - nsca when: "(({{ is_not_debian_less_than_6 }}) == True) and (({{ is_ubuntu_less_than_precise }}) == True)" diff --git a/nagios/tasks/postgresql-nagios.yml b/nagios/tasks/postgresql-nagios.yml index da995ab8..ef459fcc 100644 --- a/nagios/tasks/postgresql-nagios.yml +++ b/nagios/tasks/postgresql-nagios.yml @@ -12,7 +12,7 @@ - nagios - name: Install the packages needed to check postgres via nagios - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - check-postgres tags: diff --git a/postfix-relay/tasks/postfix-relay-server.yml b/postfix-relay/tasks/postfix-relay-server.yml index 3e0f03ad..75fb1977 100644 --- a/postfix-relay/tasks/postfix-relay-server.yml +++ b/postfix-relay/tasks/postfix-relay-server.yml @@ -9,7 +9,7 @@ tags: postfix-relay - name: Install the sasl2 authentication infrastructure - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: '{{ postfix_sasl_packages }}' tags: postfix-relay diff --git a/redmine/tasks/base-packages-old-gems.yml b/redmine/tasks/base-packages-old-gems.yml index 72a1b280..61645b44 100644 --- a/redmine/tasks/base-packages-old-gems.yml +++ b/redmine/tasks/base-packages-old-gems.yml @@ -1,6 +1,6 @@ --- - name: install the packages needed to run the redmine infrastructure. install the ruby packages needed to run redmine. Set ruby 1.9.3 as default - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: redmine_base_packages_old_gems notify: - set ruby 1.9.3 as default diff --git a/redmine/tasks/base-packages.yml b/redmine/tasks/base-packages.yml index f3a2d3fa..b05a1869 100644 --- a/redmine/tasks/base-packages.yml +++ b/redmine/tasks/base-packages.yml @@ -1,6 +1,6 @@ --- - name: Install the packages needed to run the redmine infrastructure. install the ruby packages needed to run redmine. Use ruby 2.0 - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: redmine_base_packages tags: - ruby diff --git a/redmine/tasks/redmine.yml b/redmine/tasks/redmine.yml index 6d9129fc..90ca48b1 100644 --- a/redmine/tasks/redmine.yml +++ b/redmine/tasks/redmine.yml @@ -91,7 +91,7 @@ tags: redmine - name: Install the packages needed by plugins or to build plugins required gems - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - libxslt1-dev tags: redmine diff --git a/tomcat-apache-requirements/tasks/packages.yml b/tomcat-apache-requirements/tasks/packages.yml index 31de7ad5..13c8a3c9 100644 --- a/tomcat-apache-requirements/tasks/packages.yml +++ b/tomcat-apache-requirements/tasks/packages.yml @@ -1,13 +1,13 @@ --- - name: Install the postgresql command line client - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - postgresql-client when: tomcat_install_jdbc is defined and tomcat_install_jdbc tags: [ 'postgres', 'postgresql', 'tomcat' ] - name: Install the mongodb client - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - mongodb-clients when: diff --git a/tomcat/tasks/pgsql_jdbc.yml b/tomcat/tasks/pgsql_jdbc.yml index 5cdb7e40..bbf65738 100644 --- a/tomcat/tasks/pgsql_jdbc.yml +++ b/tomcat/tasks/pgsql_jdbc.yml @@ -1,7 +1,7 @@ --- # Postgresql JDBC - name: Install the jdbc package if needed - apt: pkg={{ item }} state=installed + apt: pkg={{ item }} state=present with_items: - libpostgresql-jdbc-java when: tomcat_install_pg_jdbc diff --git a/vsftpd/tasks/main.yml b/vsftpd/tasks/main.yml index 6264cf08..0885c9c7 100644 --- a/vsftpd/tasks/main.yml +++ b/vsftpd/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: Install the vsftpd package - apt: pkg=vsftpd state=installed update_cache=yes cache_valid_time=3600 + apt: pkg=vsftpd state=present update_cache=yes cache_valid_time=3600 tags: [ 'vsftpd', 'ftp' ] - name: Install the vsftpd configuration file