From a73a2b17401f634536391b10d7fb01f501317876 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Fri, 4 Nov 2016 11:15:18 -0700 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: I9cd230ba21008afca3ed21cb20e49a80a2afe6c4 --- defaults/main.yml | 1 + handlers/main.yml | 3 +-- tasks/designate_db_setup.yml | 2 ++ tasks/designate_install.yml | 4 ++-- tasks/main.yml | 2 ++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f99ccaf..556888d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -19,6 +19,7 @@ debug: False # Set the package install state for distribution packages # Options are 'present' and 'latest' designate_package_state: "latest" +designate_pip_package_state: "latest" ## The git source/branch designate_git_repo: https://git.openstack.org/openstack/designate diff --git a/handlers/main.yml b/handlers/main.yml index 0627b60..6923103 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -20,8 +20,7 @@ - Restart designate services - name: Reload upstart init scripts - shell: | - initctl reload-configuration + command: initctl reload-configuration notify: - Restart designate services diff --git a/tasks/designate_db_setup.yml b/tasks/designate_db_setup.yml index d4e0e61..c29728b 100644 --- a/tasks/designate_db_setup.yml +++ b/tasks/designate_db_setup.yml @@ -17,8 +17,10 @@ command: "{{ designate_bin }}/designate-manage database sync" become: yes become_user: "{{ designate_system_user_name }}" + changed_when: false - name: Perform a Designate Pool Manager Cache sync command: "{{ designate_bin }}/designate-manage pool-manager-cache sync" become: yes become_user: "{{ designate_system_user_name }}" + changed_when: false diff --git a/tasks/designate_install.yml b/tasks/designate_install.yml index 86444f3..baeede4 100644 --- a/tasks/designate_install.yml +++ b/tasks/designate_install.yml @@ -29,7 +29,7 @@ - name: Install requires pip packages pip: name: "{{ designate_requires_pip_packages | join(' ') }}" - state: latest + state: "{{ designate_pip_package_state }}" extra_args: >- {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ pip_install_options | default('') }} @@ -105,7 +105,7 @@ - name: Install pip packages pip: name: "{{ designate_pip_packages | join(' ') }}" - state: latest + state: "{{ designate_pip_package_state }}" virtualenv: "{{ designate_bin | dirname }}" virtualenv_site_packages: "no" extra_args: >- diff --git a/tasks/main.yml b/tasks/main.yml index 46e4ab3..d8cdca6 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,8 +23,10 @@ - "{{ ansible_os_family | lower }}.yml" tags: - always + - name: Check init system command: cat /proc/1/comm + changed_when: false register: _pid1_name tags: - always