From 5c954a348652b0a8deb592f87c8194b568f275b6 Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 2 Nov 2016 12:33:12 +0000 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: I37ed27a28c0551af99a1f730b2b61d0ad1db4a3b --- defaults/main.yml | 2 ++ tasks/main.yml | 1 + tasks/trove_db_setup.yml | 1 + tasks/trove_init_upstart.yml | 3 +-- tasks/trove_install.yml | 4 ++-- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 951905f..45fe713 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,7 +15,9 @@ # # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens + trove_package_state: "latest" +trove_pip_package_state: "latest" debug: false trove_system_group_name: trove diff --git a/tasks/main.yml b/tasks/main.yml index 591e06e..e0331ee 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -29,6 +29,7 @@ - name: Check init system command: cat /proc/1/comm + changed_when: false register: _pid1_name tags: - always diff --git a/tasks/trove_db_setup.yml b/tasks/trove_db_setup.yml index 52e9c81..e4a14b2 100644 --- a/tasks/trove_db_setup.yml +++ b/tasks/trove_db_setup.yml @@ -22,3 +22,4 @@ db_sync {{ trove_db_sync_options }} become: yes become_user: "{{ trove_system_user_name }}" + changed_when: false diff --git a/tasks/trove_init_upstart.yml b/tasks/trove_init_upstart.yml index f39bf26..532c22a 100644 --- a/tasks/trove_init_upstart.yml +++ b/tasks/trove_init_upstart.yml @@ -30,8 +30,7 @@ - Restart Apache - name: Reload init scripts - shell: | - initctl reload-configuration + command: initctl reload-configuration when: upstart_init | changed notify: - Restart trove API services diff --git a/tasks/trove_install.yml b/tasks/trove_install.yml index ad5ff4e..b8b5c36 100644 --- a/tasks/trove_install.yml +++ b/tasks/trove_install.yml @@ -55,7 +55,7 @@ - name: Install required pip packages pip: name: "{{ trove_requires_pip_packages | join(' ') }}" - state: latest + state: "{{ trove_pip_package_state }}" extra_args: "{{ pip_install_options_fact }}" register: install_packages until: install_packages|success @@ -129,7 +129,7 @@ - name: Install pip packages pip: name: "{{ trove_pip_packages | join(' ') }}" - state: latest + state: "{{ trove_pip_package_state }}" virtualenv: "{{ trove_bin | dirname }}" virtualenv_site_packages: "no" extra_args: "{{ pip_install_options_fact }}"