From 57e026fccd2376e03a6a4153f6c84bdffb4ddd74 Mon Sep 17 00:00:00 2001 From: "Donovan Francesco (drifterza)" Date: Mon, 7 Nov 2016 16:53:28 +0200 Subject: [PATCH] Fix linting issues for ansible-lint 3.4.1 Preparing this role for the ansible-lint version bump Change-Id: I8bfa56de4f69f121cdec419d3135153dc26edfbd --- defaults/main.yml | 2 +- handlers/main.yml | 3 +-- meta/main.yml | 18 ++++++++++++------ tasks/install.yml | 4 ++-- tasks/main.yml | 1 + tasks/pre-install.yml | 2 +- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 75049c9..9d54fee 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -16,7 +16,7 @@ # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens monasca_package_state: "latest" - +monasca_pip_package_state: "latest" debug: false ## System info diff --git a/handlers/main.yml b/handlers/main.yml index 493252c..31b70a9 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -22,8 +22,7 @@ - Restart monasca services - name: Reload upstart init scripts - shell: | - initctl reload-configuration + command: initctl reload-configuration notify: - Restart monasca services diff --git a/meta/main.yml b/meta/main.yml index 0e14db9..4af34a7 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -42,9 +42,15 @@ dependencies: - role: apt_package_pinning when: - ansible_pkg_mgr == 'apt' - - ansible-zookeeper - - ansible-kafka - - ansible-storm - - ansible-influxdb - - ansible-grafana - - ansible-monasca-schema + - role: ansible-zookeeper + tags: skip_ansible_lint + - role: ansible-kafka + tags: skip_ansible_lint + - role: ansible-storm + tags: skip_ansible_lint + - role: ansible-influxdb + tags: skip_ansible_lint + - role: ansible-grafana + tags: skip_ansible_lint + - role: ansible-monasca-schema + tags: skip_ansible_lint diff --git a/tasks/install.yml b/tasks/install.yml index fe38497..154210f 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -68,7 +68,7 @@ - name: Install requires pip packages pip: name: "{{ monasca_requires_pip_packages | join(' ') }}" - state: latest + state: "{{ monasca_pip_package_state }}" extra_args: "{{ pip_install_options_fact }}" register: install_packages until: install_packages|success @@ -139,7 +139,7 @@ - name: Install pip packages pip: name: "{{ monasca_pip_packages | join(' ') }}" - state: latest + state: "{{ monasca_pip_package_state }}" virtualenv: "{{ monasca_bin | dirname }}" virtualenv_site_packages: "no" extra_args: "{{ pip_install_options_fact }}" diff --git a/tasks/main.yml b/tasks/main.yml index e741ddc..913f682 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/pre-install.yml b/tasks/pre-install.yml index 781b9d0..13975c3 100644 --- a/tasks/pre-install.yml +++ b/tasks/pre-install.yml @@ -26,7 +26,7 @@ - name: Install Apt dependencies apt: pkg: "{{ item }}" - state: "latest" + state: "{{ monasca_package_state }}" register: install_deps until: install_deps | success retries: 5