From e718101366c5d5768d2cca59386dc06e7ae09e5a Mon Sep 17 00:00:00 2001 From: Logan V Date: Wed, 2 Nov 2016 11:57:22 +0000 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: If3a68d50f07711b4dff101dda1c5c997e46e71d2 --- defaults/main.yml | 3 ++- handlers/main.yml | 4 ++-- tasks/glance_db_setup.yml | 2 ++ tasks/glance_install.yml | 4 ++-- tasks/main.yml | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index eeec750e..2aec7673 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,9 +16,10 @@ ## Verbosity Options debug: False -# Set the package install state for distribution packages +# Set the package install state for distribution and pip packages # Options are 'present' and 'latest' glance_package_state: "latest" +glance_pip_package_state: "latest" glance_git_repo: https://git.openstack.org/openstack/glance glance_git_install_branch: master diff --git a/handlers/main.yml b/handlers/main.yml index d49a143e..3e37f17f 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -19,8 +19,8 @@ - Restart glance services - name: Reload upstart init scripts - shell: | - initctl reload-configuration + command: initctl reload-configuration + changed_when: false notify: - Restart glance services diff --git a/tasks/glance_db_setup.yml b/tasks/glance_db_setup.yml index 78d98dc0..d9a66e91 100644 --- a/tasks/glance_db_setup.yml +++ b/tasks/glance_db_setup.yml @@ -17,8 +17,10 @@ command: "{{ glance_bin }}/glance-manage db_sync" become: yes become_user: "{{ glance_system_user_name }}" + changed_when: false - name: Load glance metadata definitions command: "{{ glance_bin }}/glance-manage db_load_metadefs {{ glance_etc_dir }}/metadefs" become: yes become_user: "{{ glance_system_user_name }}" + changed_when: false diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml index ea431e76..c4f74e44 100644 --- a/tasks/glance_install.yml +++ b/tasks/glance_install.yml @@ -58,7 +58,7 @@ - name: Install requires pip packages pip: name: "{{ glance_requires_pip_packages | join(' ') }}" - state: latest + state: "{{ glance_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: "{{ glance_pip_packages | join(' ') }}" - state: latest + state: "{{ glance_pip_package_state }}" virtualenv: "{{ glance_bin | dirname }}" virtualenv_site_packages: "no" extra_args: "{{ pip_install_options_fact }}" diff --git a/tasks/main.yml b/tasks/main.yml index 89ac29ae..92015b63 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -27,6 +27,7 @@ - name: Check init system command: cat /proc/1/comm + changed_when: false register: _pid1_name tags: - always