Skip to content

Commit 9d52909

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
ansible-lint: Fix fqcn[actions-core] for masakari
Change-Id: I9839a9b10d8caf31066d5d309ae163abed186e83 Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
1 parent ef210b2 commit 9d52909

18 files changed

+36
-53
lines changed

.ansible-lint-ignore

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,4 @@
11
# This file contains ignores rule violations for ansible-lint skip
2-
ansible/roles/masakari/tasks/bootstrap.yml fqcn[action-core] skip
3-
ansible/roles/masakari/tasks/check-containers.yml fqcn[action-core] skip
4-
ansible/roles/masakari/tasks/check.yml fqcn[action-core] skip
5-
ansible/roles/masakari/tasks/clone.yml fqcn[action-core] skip
6-
ansible/roles/masakari/tasks/config.yml fqcn[action-core] skip
7-
ansible/roles/masakari/tasks/config_validate.yml fqcn[action-core] skip
8-
ansible/roles/masakari/tasks/copy-certs.yml fqcn[action-core] skip
9-
ansible/roles/masakari/tasks/deploy-containers.yml fqcn[action-core] skip
10-
ansible/roles/masakari/tasks/deploy.yml fqcn[action-core] skip
11-
ansible/roles/masakari/tasks/loadbalancer.yml fqcn[action-core] skip
12-
ansible/roles/masakari/tasks/main.yml fqcn[action-core] skip
13-
ansible/roles/masakari/tasks/precheck.yml fqcn[action-core] skip
14-
ansible/roles/masakari/tasks/pull.yml fqcn[action-core] skip
15-
ansible/roles/masakari/tasks/reconfigure.yml fqcn[action-core] skip
16-
ansible/roles/masakari/tasks/register.yml fqcn[action-core] skip
17-
ansible/roles/masakari/tasks/stop.yml fqcn[action-core] skip
18-
ansible/roles/masakari/tasks/upgrade.yml fqcn[action-core] skip
192
ansible/roles/memcached/tasks/check-containers.yml fqcn[action-core] skip
203
ansible/roles/memcached/tasks/check.yml fqcn[action-core] skip
214
ansible/roles/memcached/tasks/config.yml fqcn[action-core] skip

ansible/roles/masakari/tasks/bootstrap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
- not use_preconfigured_databases | bool
3939

4040
- name: Run masakari bootstrap container
41-
import_tasks: bootstrap_service.yml
41+
ansible.builtin.import_tasks: bootstrap_service.yml
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
- name: Check masakari containers
3-
import_role:
3+
ansible.builtin.import_role:
44
name: service-check-containers
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
- name: Checking Masakari containers
3-
import_role:
3+
ansible.builtin.import_role:
44
role: service-check

ansible/roles/masakari/tasks/clone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
- name: Cloning masakari source repository for development
33
become: true
4-
git:
4+
ansible.builtin.git:
55
repo: "{{ masakari_git_repository }}"
66
dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
77
update: "{{ masakari_dev_repos_pull }}"
88
version: "{{ masakari_source_version }}"
99

1010
- name: Cloning masakari monitors source repository for development
1111
become: true
12-
git:
12+
ansible.builtin.git:
1313
repo: "{{ masakari_monitors_git_repository }}"
1414
dest: "{{ kolla_dev_repos_directory }}/masakari-monitors"
1515
update: "{{ masakari_monitors_dev_repos_pull }}"

ansible/roles/masakari/tasks/config.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Ensuring config directories exist
3-
file:
3+
ansible.builtin.file:
44
path: "{{ node_config_directory }}/{{ item.key }}"
55
state: "directory"
66
owner: "{{ config_owner_user }}"
@@ -10,7 +10,7 @@
1010
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
1111

1212
- name: Check if policies shall be overwritten
13-
stat:
13+
ansible.builtin.stat:
1414
path: "{{ item }}"
1515
delegate_to: localhost
1616
run_once: true
@@ -22,14 +22,14 @@
2222
skip: true
2323

2424
- name: Set masakari policy file
25-
set_fact:
25+
ansible.builtin.set_fact:
2626
masakari_policy_file: "{{ masakari_policy.results.0.stat.path | basename }}"
2727
masakari_policy_file_path: "{{ masakari_policy.results.0.stat.path }}"
2828
when:
2929
- masakari_policy.results | length > 0
3030

3131
- name: Copying over existing policy file
32-
template:
32+
ansible.builtin.template:
3333
src: "{{ masakari_policy_file_path }}"
3434
dest: "{{ node_config_directory }}/{{ item.key }}/{{ masakari_policy_file }}"
3535
mode: "0660"
@@ -39,15 +39,15 @@
3939
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
4040

4141
- name: Copying over config.json files for services
42-
template:
42+
ansible.builtin.template:
4343
src: "{{ item.key }}.json.j2"
4444
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
4545
mode: "0660"
4646
become: true
4747
with_dict: "{{ masakari_services | select_services_enabled_and_mapped_to_host }}"
4848

4949
- name: Copying over TLS certificates
50-
include_tasks: copy-certs.yml
50+
ansible.builtin.include_tasks: copy-certs.yml
5151
when:
5252
- masakari_copy_certs | bool
5353

@@ -92,7 +92,7 @@
9292
- name: Copying over wsgi-masakari file for services
9393
vars:
9494
service: "{{ masakari_services['masakari-api'] }}"
95-
template:
95+
ansible.builtin.template:
9696
src: "wsgi-masakari.conf.j2"
9797
dest: "{{ node_config_directory }}/masakari-api/wsgi-masakari.conf"
9898
mode: "0660"
@@ -102,7 +102,7 @@
102102
- masakari_wsgi_provider == "apache"
103103

104104
- name: "Configure uWSGI for Masakari"
105-
include_role:
105+
ansible.builtin.include_role:
106106
name: service-uwsgi-config
107107
vars:
108108
project_services: "{{ masakari_services }}"
@@ -134,7 +134,7 @@
134134
vars:
135135
service_name: "{{ item.service }}"
136136
service: "{{ masakari_services[service_name] }}"
137-
template:
137+
ansible.builtin.template:
138138
src: "{{ item.src }}"
139139
dest: "{{ node_config_directory }}/{{ service_name }}/{{ item.dest }}"
140140
mode: "0660"

ansible/roles/masakari/tasks/config_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: Validate masakari configuration
3-
import_role:
3+
ansible.builtin.import_role:
44
name: service-config-validate
55
vars:
66
service_config_validate_services: "{{ masakari_services }}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- name: "Copy certificates and keys for {{ project_name }}"
3-
import_role:
3+
ansible.builtin.import_role:
44
role: service-cert-copy
55
vars:
66
project_services: "{{ masakari_services }}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
- name: Check masakari containers
3-
import_tasks: check-containers.yml
3+
ansible.builtin.import_tasks: check-containers.yml
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
---
22
- name: Register masakari in Keystone
3-
import_tasks: register.yml
3+
ansible.builtin.import_tasks: register.yml
44

55
- name: Configure masakari
6-
import_tasks: config.yml
6+
ansible.builtin.import_tasks: config.yml
77

88
- name: Check masakari containers
9-
import_tasks: check-containers.yml
9+
ansible.builtin.import_tasks: check-containers.yml
1010

1111
- name: Clone masakari repository
12-
include_tasks: clone.yml
12+
ansible.builtin.include_tasks: clone.yml
1313
when: masakari_dev_mode | bool
1414

1515
- name: Bootstrap masakari service
16-
import_tasks: bootstrap.yml
16+
ansible.builtin.import_tasks: bootstrap.yml
1717

1818
- name: Flush handlers
19-
meta: flush_handlers
19+
ansible.builtin.meta: flush_handlers

0 commit comments

Comments
 (0)