From 2128075c6e8f160e33a68d6f3e3cf5b19c3c74db Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 20 Apr 2020 10:00:51 +0200
Subject: [PATCH] Ansible lint related fixes
Change-Id: I146ea3d84efb83ec5d7405644ad372e57ecafc1e
---
ansible/post-deploy.yml | 3 ++-
ansible/roles/kibana/tasks/migrate-kibana-index.yml | 2 +-
ansible/roles/kibana/tasks/post_config.yml | 2 +-
ansible/roles/manila/tasks/fix_cephfs_owner.yml | 4 +++-
ansible/roles/neutron/tasks/config-host.yml | 8 +++++++-
ansible/roles/prechecks/tasks/package_checks.yml | 4 +++-
6 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml
index ae95aabcb6..f0bc32c882 100644
--- a/ansible/post-deploy.yml
+++ b/ansible/post-deploy.yml
@@ -3,7 +3,8 @@
hosts: localhost
become: true
tasks:
- - template:
+ - name: Template out admin-openrc.sh
+ template:
src: "roles/common/templates/admin-openrc.sh.j2"
dest: "{{ node_config }}/admin-openrc.sh"
run_once: True
diff --git a/ansible/roles/kibana/tasks/migrate-kibana-index.yml b/ansible/roles/kibana/tasks/migrate-kibana-index.yml
index 694a5a8d96..98df5317a7 100644
--- a/ansible/roles/kibana/tasks/migrate-kibana-index.yml
+++ b/ansible/roles/kibana/tasks/migrate-kibana-index.yml
@@ -80,7 +80,7 @@
"index": ".kibana-6"
},
"script": {
- "inline": "ctx._source = [ ctx._type : ctx._source ]; ctx._source.type = ctx._type; ctx._id = ctx._type + \":\" + ctx._id; ctx._type = \"doc\"; ",
+ "inline": "ctx._source = [ ctx._type : ctx._source ]; ctx._source.type = ctx._type; ctx._id = ctx._type + \":\" + ctx._id; ctx._type = \"doc\"; ", # noqa 204
"lang": "painless"
}
}
diff --git a/ansible/roles/kibana/tasks/post_config.yml b/ansible/roles/kibana/tasks/post_config.yml
index 0d393b5f25..10c757b60a 100644
--- a/ansible/roles/kibana/tasks/post_config.yml
+++ b/ansible/roles/kibana/tasks/post_config.yml
@@ -77,7 +77,7 @@
kolla_toolbox:
module_name: uri
module_args:
- url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/index-pattern/{{ kibana_default_index_pattern }}"
+ url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/index-pattern/{{ kibana_default_index_pattern }}" # noqa 204
method: PUT
body: "{{ kibana_default_index | to_json }}"
body_format: json
diff --git a/ansible/roles/manila/tasks/fix_cephfs_owner.yml b/ansible/roles/manila/tasks/fix_cephfs_owner.yml
index 2f6de27ca1..17c8de2188 100644
--- a/ansible/roles/manila/tasks/fix_cephfs_owner.yml
+++ b/ansible/roles/manila/tasks/fix_cephfs_owner.yml
@@ -47,7 +47,9 @@
- name: Mount cephfs
become: true
- command: "docker exec -u 0 {{ manila_services['manila-share']['container_name'] }} mount -t ceph {{ cephfs_addr }} /tmp/cephfs -o name=manila,secret={{ manila_keyring.stdout }}"
+ command: >
+ docker exec -u 0 {{ manila_services['manila-share']['container_name'] }}
+ mount -t ceph {{ cephfs_addr }} /tmp/cephfs -o name=manila,secret={{ manila_keyring.stdout }}
register: mount_cephfs
changed_when: False
run_once: True
diff --git a/ansible/roles/neutron/tasks/config-host.yml b/ansible/roles/neutron/tasks/config-host.yml
index 59db51add8..a2122363de 100644
--- a/ansible/roles/neutron/tasks/config-host.yml
+++ b/ansible/roles/neutron/tasks/config-host.yml
@@ -5,7 +5,13 @@
vars:
modules:
- {'name': ip6_tables}
- when: neutron_services | select_services_enabled_and_mapped_to_host | list | intersect([ "neutron-l3-agent", "neutron-linuxbridge-agent", "neutron-openvswitch-agent" ]) | list | length > 0
+ when: >-
+ neutron_services |
+ select_services_enabled_and_mapped_to_host |
+ list |
+ intersect([ "neutron-l3-agent", "neutron-linuxbridge-agent", "neutron-openvswitch-agent" ]) |
+ list |
+ length > 0
- name: Setting sysctl values
become: true
diff --git a/ansible/roles/prechecks/tasks/package_checks.yml b/ansible/roles/prechecks/tasks/package_checks.yml
index f8f65136ee..a88e667f20 100644
--- a/ansible/roles/prechecks/tasks/package_checks.yml
+++ b/ansible/roles/prechecks/tasks/package_checks.yml
@@ -13,6 +13,8 @@
vars:
ansible_version_host: "{{ ansible_version.major }}.{{ ansible_version.minor }}"
fail:
- msg: "Ansible version should be between {{ ansible_version_min }} and {{ ansible_version_max }}. Current version is {{ ansible_version.full }} which is not supported."
+ msg: >-
+ Ansible version should be between {{ ansible_version_min }} and {{ ansible_version_max }}.
+ Current version is {{ ansible_version.full }} which is not supported.
run_once: true
when: ansible_version_host is version(ansible_version_min, '<') or ansible_version_host is version(ansible_version_max, '>')