From 96972648a5bd9d5bc4039a4e06006e4b4037e7ed Mon Sep 17 00:00:00 2001 From: "Trung Nguyen (Monash University)" <trung.nguyen1@monash.edu> Date: Wed, 3 Apr 2019 15:06:52 +1100 Subject: [PATCH] Fix Deprecation warnings Former-commit-id: 19a3d174286be94c038c6de8e523cf339ce48118 --- roles/config_repos/tasks/main.yml | 2 ++ roles/ldapclient/tasks/installOpenLdap.yml | 12 +++--------- roles/mellanox_drivers/tasks/main.yml | 2 +- roles/rsyslog_client/tasks/main.yml | 2 +- roles/slurm-common/tasks/installCgroup.yml | 13 ++++++++----- roles/upgrade/tasks/main.yml | 2 ++ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/roles/config_repos/tasks/main.yml b/roles/config_repos/tasks/main.yml index fe8f56f6..fd13eb52 100644 --- a/roles/config_repos/tasks/main.yml +++ b/roles/config_repos/tasks/main.yml @@ -41,6 +41,8 @@ shell: yum repolist all | grep enabled | cut -f 1 -d '/' | sed -s 's/\!//' register: repolist check_mode: no + args: + warn: False - name: disable unwanted repos shell: yum-config-manager --disable "{{ item }}" diff --git a/roles/ldapclient/tasks/installOpenLdap.yml b/roles/ldapclient/tasks/installOpenLdap.yml index b11a480d..f0db145e 100644 --- a/roles/ldapclient/tasks/installOpenLdap.yml +++ b/roles/ldapclient/tasks/installOpenLdap.yml @@ -1,14 +1,8 @@ --- - name: "Install open ldap package yum" - yum: name={{ item }} state=present - with_items: - - openldap - - openldap-clients - - sssd - - sssd-common - - sssd-client - - nss - - nss-tools + yum: + name: ['openldap', 'openldap-clients', 'sssd', 'sssd-common', 'sssd-client', 'nss', 'nss-tools'] + state: present sudo: true when: ansible_os_family == 'RedHat' diff --git a/roles/mellanox_drivers/tasks/main.yml b/roles/mellanox_drivers/tasks/main.yml index 146f1a70..c6c1f4a3 100644 --- a/roles/mellanox_drivers/tasks/main.yml +++ b/roles/mellanox_drivers/tasks/main.yml @@ -53,7 +53,7 @@ set_fact: install_now: true reboot_now: true - when: driver_version | failed or not desired_driver_version.stdout in driver_version.stdout + when: driver_version is failed or not desired_driver_version.stdout in driver_version.stdout - name: debug - print out value of install_now debug: var=install_now diff --git a/roles/rsyslog_client/tasks/main.yml b/roles/rsyslog_client/tasks/main.yml index 2aec4a9c..9b087381 100644 --- a/roles/rsyslog_client/tasks/main.yml +++ b/roles/rsyslog_client/tasks/main.yml @@ -22,4 +22,4 @@ service: name=rsyslog state=restarted become: true become_user: root - when: config_changed | changed + when: config_changed is changed diff --git a/roles/slurm-common/tasks/installCgroup.yml b/roles/slurm-common/tasks/installCgroup.yml index 9b21e1b4..c7f4253d 100644 --- a/roles/slurm-common/tasks/installCgroup.yml +++ b/roles/slurm-common/tasks/installCgroup.yml @@ -2,7 +2,8 @@ yum: name={{ item }} state=installed with_items: - libcgroup - sudo: true + become: True + become_method: sudo when: ansible_os_family == "RedHat" - name: apt install cgroup @@ -11,14 +12,16 @@ - cgmanager - cgmanager-utils - libcgmanager0 - sudo: true when: ansible_os_family == "Debian" - sudo: true + become: True + become_method: sudo - name: config cgroup.conf file template: dest={{ slurm_dir }}/etc/cgroup.conf src=cgroup.conf.j2 mode=644 - sudo: true + become: True + become_method: sudo - name: config cgroup_allowed_devices.conf file template: dest={{ slurm_dir }}/etc/cgroup_allowed_devices.conf src=cgroup_allowed_devices.conf.j2 mode=644 - sudo: true + become: True + become_method: sudo diff --git a/roles/upgrade/tasks/main.yml b/roles/upgrade/tasks/main.yml index 4f29a072..0d0a6041 100644 --- a/roles/upgrade/tasks/main.yml +++ b/roles/upgrade/tasks/main.yml @@ -53,6 +53,8 @@ when: ansible_os_family=="RedHat" check_mode: no changed_when: False + args: + warn: False - name: get kernel version shell: uname -r -- GitLab