From 73f695ab7251e153c2c95f73d624585ce8432355 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Mon, 9 Oct 2017 00:37:39 +0200 Subject: [PATCH] Move the rest of yum: to package: as well Signed-off-by: Patrick Uiterwijk --- playbooks/groups/anitya.yml | 2 +- playbooks/groups/bastion.yml | 2 +- playbooks/groups/darkserver.yml | 2 +- playbooks/groups/download.yml | 2 +- playbooks/groups/mailman.yml | 4 ++-- playbooks/groups/mirrorlist2.yml | 2 +- playbooks/groups/noc.yml | 2 +- playbooks/groups/pagure.yml | 2 +- playbooks/groups/secondary.yml | 2 +- .../ansiblemagazine.fedorainfracloud.org.yml | 2 +- .../hosts/artboard.fedorainfracloud.org.yml | 4 ++-- .../hosts/communityblog.fedorainfracloud.org.yml | 2 +- .../data-analysis01.phx2.fedoraproject.org.yml | 2 +- .../fed-cloud09.cloud.fedoraproject.org.yml | 16 ++++++++-------- .../fedora-bootstrap.fedorainfracloud.org.yml | 2 +- .../hosts/lists-dev.fedorainfracloud.org.yml | 6 +++--- .../hosts/magazine2.fedorainfracloud.org.yml | 2 +- .../hosts/upstreamfirst.fedorainfracloud.org.yml | 2 +- playbooks/include/proxies-websites.yml | 2 +- playbooks/transient_cloud_instance.yml | 2 +- tasks/2fa_client.yml | 2 +- tasks/cloud_setup_basic.yml | 4 ++-- tasks/growroot_cloud.yml | 2 +- tasks/growroot_cloud_el7.yml | 2 +- tasks/openvpn_client.yml | 2 +- tasks/openvpn_client_7.yml | 2 +- tasks/postfix_basic.yml | 2 +- tasks/rdiff_backup_server.yml | 2 +- 28 files changed, 40 insertions(+), 40 deletions(-) diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index baeae77962..8fd3fd9098 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -48,7 +48,7 @@ tasks: - name: install fedmsg-relay - yum: pkg=fedmsg-relay state=present + package: pkg=fedmsg-relay state=present - name: and start it service: name=fedmsg-relay state=started diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index aa1dab5339..61a29c43c3 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -37,6 +37,6 @@ tasks: - name: install needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - ipmitool diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 0bcd08cd05..14f12db2b1 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -12,7 +12,7 @@ pre_tasks: - - yum: name=libsemanage-python state=present + - package: name=libsemanage-python state=present - name: "Set SElinux booleans" seboolean: name=httpd_can_network_connect_db state=yes persistent=yes diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 32f186105c..f0dfee1b50 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -61,7 +61,7 @@ copy: src="{{ files}}/download/last-sync" dest=/usr/local/bin/last-sync mode=0755 when: inventory_hostname == 'download-ib01.fedoraproject.org' - name: install bc so last-sync works. - yum: pkg=bc state=present + package: pkg=bc state=present when: inventory_hostname == 'download-ib01.fedoraproject.org' diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 64dad63fa3..4dc7cc1321 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -48,7 +48,7 @@ tasks: - name: install psycopg2 for the postgresql ansible modules - yum: pkg=python-psycopg2 state=present + package: pkg=python-psycopg2 state=present tags: - packages @@ -100,7 +100,7 @@ tasks: - name: install more needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - tar tags: diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 84b9618806..0590f76d2c 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -17,7 +17,7 @@ pre_tasks: - name: Install policycoreutils-python - yum: pkg=policycoreutils-python state=present + package: pkg=policycoreutils-python state=present - name: Create /srv/web/ for all the goodies. file: > diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index ce13fda12f..906e23daa1 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -68,7 +68,7 @@ tasks: - name: install some packages which arent in playbooks - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - nmap - tcpdump diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 88bf0b7969..12e9aeed5b 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -41,7 +41,7 @@ pre_tasks: - name: install fedmsg-relay - yum: pkg=fedmsg-relay state=present + package: pkg=fedmsg-relay state=present tags: - pagure - pagure/fedmsg diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 667a4945e6..1fe614189c 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -52,7 +52,7 @@ - include: "{{ tasks_path }}/motd.yml" - name: Install some misc packages needed for various tasks - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - createrepo - koji diff --git a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml index 132c196484..a066d67883 100644 --- a/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml +++ b/playbooks/hosts/ansiblemagazine.fedorainfracloud.org.yml @@ -30,7 +30,7 @@ tasks: - name: add packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - httpd - php diff --git a/playbooks/hosts/artboard.fedorainfracloud.org.yml b/playbooks/hosts/artboard.fedorainfracloud.org.yml index 9960ff2f75..7e3d283eae 100644 --- a/playbooks/hosts/artboard.fedorainfracloud.org.yml +++ b/playbooks/hosts/artboard.fedorainfracloud.org.yml @@ -73,7 +73,7 @@ # packages needed - name: add packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - rsync - openssh-clients @@ -89,7 +89,7 @@ # packages needed to be gone - name: erase packages - yum: state=absent name={{ item }} + package: state=absent name={{ item }} with_items: - cronie-anacron tags: diff --git a/playbooks/hosts/communityblog.fedorainfracloud.org.yml b/playbooks/hosts/communityblog.fedorainfracloud.org.yml index fe90e3b94a..437484492b 100644 --- a/playbooks/hosts/communityblog.fedorainfracloud.org.yml +++ b/playbooks/hosts/communityblog.fedorainfracloud.org.yml @@ -30,7 +30,7 @@ tasks: - name: add packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - httpd - php diff --git a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml index 6f59b8a080..932c16ce79 100644 --- a/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/data-analysis01.phx2.fedoraproject.org.yml @@ -57,7 +57,7 @@ tasks: - name: install needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - httpd - httpd-tools diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml index 16129d4312..7b665d720d 100644 --- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml @@ -64,7 +64,7 @@ - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" - name: install core pkgs - yum: state=present pkg={{ item }} + package: state=present pkg={{ item }} with_items: - libselinux-python - ntp @@ -153,18 +153,18 @@ # this two step can be done in one, but Ansible will then always show the action as changed #- name: make sure epel-release is installed # get_url: url=http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm dest=/root/ - #- yum: state=present name=/root/epel-release-latest-7.noarch.rpm + #- package: state=present name=/root/epel-release-latest-7.noarch.rpm #- name: make sure latest openvswitch is installed # get_url: url=http://people.redhat.com/~lkellogg/rpms/openvswitch-2.3.1-2.git20150113.el7.x86_64.rpm dest=/root/ - #- yum: state=present name=/root/openvswitch-2.3.1-2.git20150113.el7.x86_64.rpm + #- package: state=present name=/root/openvswitch-2.3.1-2.git20150113.el7.x86_64.rpm #- name: make sure latest openstack-utils is installed # get_url: url=https://repos.fedorapeople.org/repos/openstack/openstack-juno/epel-7/openstack-utils-2014.2-1.el7.centos.noarch.rpm dest=/root/ - #- yum: state=present name=/root/openstack-utils-2014.2-1.el7.centos.noarch.rpm + #- package: state=present name=/root/openstack-utils-2014.2-1.el7.centos.noarch.rpm - name: install basic openstack packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - openstack-utils - openstack-selinux @@ -178,7 +178,7 @@ - haproxy - name: install etckeeper - yum: state=present name=etckeeper + package: state=present name=etckeeper - name: init etckeeper shell: cd /etc && etckeeper init @@ -208,7 +208,7 @@ # http://docs.openstack.org/trunk/install-guide/install/yum/content/basics-database-controller.html - name: install mysql packages - yum: state=present pkg={{ item }} + package: state=present pkg={{ item }} with_items: - mariadb-galera-server - MySQL-python @@ -250,7 +250,7 @@ regexp="RABBITMQ_NODE_PORT" line=" 'RABBITMQ_NODE_PORTTTTT' => $port," backup=yes - - yum: state=present pkg=mongodb-server + - package: state=present pkg=mongodb-server - ini_file: dest=/usr/lib/systemd/system/mongod.service section=Service option=PIDFile value=/var/run/mongodb/mongod.pid - lineinfile: dest=/usr/lib/python2.7/site-packages/packstack/puppet/templates/mongodb.pp diff --git a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml index 9ceac8e2e2..69147719bb 100644 --- a/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml +++ b/playbooks/hosts/fedora-bootstrap.fedorainfracloud.org.yml @@ -33,7 +33,7 @@ tasks: - name: add packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - httpd - php diff --git a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml index 74f743dbb0..e7c9d91c6c 100644 --- a/playbooks/hosts/lists-dev.fedorainfracloud.org.yml +++ b/playbooks/hosts/lists-dev.fedorainfracloud.org.yml @@ -46,7 +46,7 @@ # Basic Apache config - name: install mod_ssl - yum: name=mod_ssl state=present + package: name=mod_ssl state=present - name: copy ssl.conf copy: src="{{ files }}/lists-dev/ssl.conf" dest=/etc/httpd/conf.d/ssl.conf @@ -62,7 +62,7 @@ # Database - name: install postgresql server packages - yum: name={{ item }} state=present + package: name={{ item }} state=present with_items: - postgresql-server - postgresql-contrib @@ -144,7 +144,7 @@ tasks: - name: install more needed packages - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - tar - vim diff --git a/playbooks/hosts/magazine2.fedorainfracloud.org.yml b/playbooks/hosts/magazine2.fedorainfracloud.org.yml index ed174fcb04..d2736d3814 100644 --- a/playbooks/hosts/magazine2.fedorainfracloud.org.yml +++ b/playbooks/hosts/magazine2.fedorainfracloud.org.yml @@ -30,7 +30,7 @@ tasks: - name: add packages - yum: state=present name={{ item }} + package: state=present name={{ item }} with_items: - httpd - php diff --git a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml index acade6bacb..633d465261 100644 --- a/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml +++ b/playbooks/hosts/upstreamfirst.fedorainfracloud.org.yml @@ -55,7 +55,7 @@ # pre_tasks: # - name: install fedmsg-relay -# yum: pkg=fedmsg-relay state=present +# package: pkg=fedmsg-relay state=present # tags: # - pagure # - pagure/fedmsg diff --git a/playbooks/include/proxies-websites.yml b/playbooks/include/proxies-websites.yml index cb6c959eb4..827857a002 100644 --- a/playbooks/include/proxies-websites.yml +++ b/playbooks/include/proxies-websites.yml @@ -14,7 +14,7 @@ pre_tasks: - name: Install policycoreutils-python - yum: pkg=policycoreutils-python state=present + package: pkg=policycoreutils-python state=present - name: Create /srv/web/ for all the goodies. file: > diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index dd567ef8ef..bbe26dca00 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -68,7 +68,7 @@ tasks: - name: install cloud-utils (yum) - yum: pkg=cloud-utils state=present + package: pkg=cloud-utils state=present when: ansible_distribution_major_version|int < 22 - name: install cloud-utils (dnf) diff --git a/tasks/2fa_client.yml b/tasks/2fa_client.yml index 2aea58c684..3dcc1d668a 100644 --- a/tasks/2fa_client.yml +++ b/tasks/2fa_client.yml @@ -1,6 +1,6 @@ --- - name: install pam_url - yum: name=pam_url state=present + package: name=pam_url state=present tags: - packages when: ansible_distribution_major_version|int < 22 diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml index ae412e8efa..1ff61d517c 100644 --- a/tasks/cloud_setup_basic.yml +++ b/tasks/cloud_setup_basic.yml @@ -1,6 +1,6 @@ --- - name: Install desired extra packages (yum) - yum: state=present pkg={{ item }} + package: state=present pkg={{ item }} with_items: - ntpdate - ntp @@ -22,7 +22,7 @@ - packages - name: remove some packages (yum) - yum: state=absent pkg={{ item }} + package: state=absent pkg={{ item }} with_items: - chrony tags: diff --git a/tasks/growroot_cloud.yml b/tasks/growroot_cloud.yml index 630c91957c..70fa44a72f 100644 --- a/tasks/growroot_cloud.yml +++ b/tasks/growroot_cloud.yml @@ -5,7 +5,7 @@ - config - name: install cloud-utils - yum: name=cloud-utils state=present + package: name=cloud-utils state=present tags: - packages diff --git a/tasks/growroot_cloud_el7.yml b/tasks/growroot_cloud_el7.yml index 0803064e77..ff0c8f206c 100644 --- a/tasks/growroot_cloud_el7.yml +++ b/tasks/growroot_cloud_el7.yml @@ -5,7 +5,7 @@ - config - name: install cloud-utils - yum: name=cloud-utils state=present + package: name=cloud-utils state=present tags: - packages diff --git a/tasks/openvpn_client.yml b/tasks/openvpn_client.yml index c3ff45fe03..0758fff89e 100644 --- a/tasks/openvpn_client.yml +++ b/tasks/openvpn_client.yml @@ -1,7 +1,7 @@ --- # openvpn - ftw - or something - name: install openvpn - yum: name=openvpn state=present + package: name=openvpn state=present tags: - packages diff --git a/tasks/openvpn_client_7.yml b/tasks/openvpn_client_7.yml index 76ec64a939..e2e86506ce 100644 --- a/tasks/openvpn_client_7.yml +++ b/tasks/openvpn_client_7.yml @@ -1,7 +1,7 @@ --- # openvpn - ftw - or something - name: install openvpn - yum: name=openvpn state=present + package: name=openvpn state=present tags: - packages diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml index 5a9db7eb59..1ea8733241 100644 --- a/tasks/postfix_basic.yml +++ b/tasks/postfix_basic.yml @@ -1,5 +1,5 @@ - name: install postfix - yum: pkg=postfix state=present + package: pkg=postfix state=present tags: - postfix - packages diff --git a/tasks/rdiff_backup_server.yml b/tasks/rdiff_backup_server.yml index 1e2d55366f..7c2463f3ca 100644 --- a/tasks/rdiff_backup_server.yml +++ b/tasks/rdiff_backup_server.yml @@ -1,7 +1,7 @@ --- # tasklist for setting up a rdiff backup server. - name: install rdiff-backup - yum: pkg={{ item }} state=present + package: pkg={{ item }} state=present with_items: - rdiff-backup - git