From e391de43d4de187c0b9fa6350ea24bb07218dabd Mon Sep 17 00:00:00 2001 From: Lindsay Hill Date: Tue, 18 Dec 2018 16:50:26 -0800 Subject: [PATCH 1/4] New linting rules --- .circleci/config.yml | 2 +- roles/bwc/meta/main.yml | 8 +++----- roles/bwc/tasks/bwc_repos_setup.yml | 2 +- roles/bwc_smoketests/meta/main.yml | 8 +++----- roles/epel/meta/main.yml | 2 +- roles/mongodb/meta/main.yml | 2 +- roles/nginx/meta/main.yml | 2 +- roles/nodejs/meta/main.yml | 2 +- roles/postgresql/meta/main.yml | 2 +- roles/rabbitmq/meta/main.yml | 2 +- roles/st2/meta/main.yml | 2 +- roles/st2/tasks/proxy.yml | 2 +- roles/st2chatops/meta/main.yml | 2 +- roles/st2chatops/tasks/main.yml | 2 +- roles/st2mistral/meta/main.yml | 2 +- roles/st2repo/meta/main.yml | 2 +- roles/st2web/meta/main.yml | 2 +- 17 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 87016807..9207e098 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,4 +18,4 @@ jobs: - run: name: Ansible-lint check command: | - ansible-lint -v roles/*/*/*.yaml roles/*/*/*.yml stackstorm.yml + ansible-lint -x 204 -v roles/*/*/*.yml stackstorm.yml diff --git a/roles/bwc/meta/main.yml b/roles/bwc/meta/main.yml index e168aaf3..944d4ffd 100644 --- a/roles/bwc/meta/main.yml +++ b/roles/bwc/meta/main.yml @@ -14,12 +14,10 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - stackstorm - - BWC - - Brocade Workflow Composer - - EWC - - Extreme Workflow Composer + - bwc + - ewc - repositories - packagecloud dependencies: diff --git a/roles/bwc/tasks/bwc_repos_setup.yml b/roles/bwc/tasks/bwc_repos_setup.yml index 6b2a8e2f..e7fbe214 100644 --- a/roles/bwc/tasks/bwc_repos_setup.yml +++ b/roles/bwc/tasks/bwc_repos_setup.yml @@ -63,4 +63,4 @@ - ewc - enterprise register: bwc_repo_added - when: bwc_read_token != '' + when: bwc_read_token diff --git a/roles/bwc_smoketests/meta/main.yml b/roles/bwc_smoketests/meta/main.yml index 948a1b7c..7eb2b823 100644 --- a/roles/bwc_smoketests/meta/main.yml +++ b/roles/bwc_smoketests/meta/main.yml @@ -14,12 +14,10 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - stackstorm - - BWC - - Brocade Workflow Composer - - EWC - - Extreme Workflow Composer + - bwc + - ewc - repositories - packagecloud dependencies: diff --git a/roles/epel/meta/main.yml b/roles/epel/meta/main.yml index 7d62b673..fba07c7e 100644 --- a/roles/epel/meta/main.yml +++ b/roles/epel/meta/main.yml @@ -10,5 +10,5 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system diff --git a/roles/mongodb/meta/main.yml b/roles/mongodb/meta/main.yml index d3534163..7ea40ffa 100644 --- a/roles/mongodb/meta/main.yml +++ b/roles/mongodb/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system dependencies: - role: epel diff --git a/roles/nginx/meta/main.yml b/roles/nginx/meta/main.yml index 114d1d9d..a3cfe394 100644 --- a/roles/nginx/meta/main.yml +++ b/roles/nginx/meta/main.yml @@ -15,6 +15,6 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - web - nginx diff --git a/roles/nodejs/meta/main.yml b/roles/nodejs/meta/main.yml index db4feb2d..cfab600b 100644 --- a/roles/nodejs/meta/main.yml +++ b/roles/nodejs/meta/main.yml @@ -15,5 +15,5 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system diff --git a/roles/postgresql/meta/main.yml b/roles/postgresql/meta/main.yml index 71d87bfb..c95ea29b 100644 --- a/roles/postgresql/meta/main.yml +++ b/roles/postgresql/meta/main.yml @@ -15,5 +15,5 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system diff --git a/roles/rabbitmq/meta/main.yml b/roles/rabbitmq/meta/main.yml index e38de1fe..913c9b17 100644 --- a/roles/rabbitmq/meta/main.yml +++ b/roles/rabbitmq/meta/main.yml @@ -14,5 +14,5 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system diff --git a/roles/st2/meta/main.yml b/roles/st2/meta/main.yml index d0a30986..dbeb5ff0 100644 --- a/roles/st2/meta/main.yml +++ b/roles/st2/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - stackstorm - st2 - automation diff --git a/roles/st2/tasks/proxy.yml b/roles/st2/tasks/proxy.yml index f68ba8c4..45f2b54c 100644 --- a/roles/st2/tasks/proxy.yml +++ b/roles/st2/tasks/proxy.yml @@ -6,7 +6,7 @@ dest: /etc/{{ 'default' if ansible_facts.pkg_mgr == 'apt' else 'sysconfig' }}/{{ item.0 }} create: yes regexp: '^{{ item.1 }}=' - line: "{{ item.1}}={{ ansible_facts.env.get(item.1) }}" + line: "{{ item.1 }}={{ ansible_facts.env.get(item.1) }}" # NB: Empty ENV var cast to 'None' string in Ansible state: "{{ 'present' if ansible_facts.env.get(item.1, 'None') != 'None' else 'absent' }}" vars: diff --git a/roles/st2chatops/meta/main.yml b/roles/st2chatops/meta/main.yml index 2330bef7..fb2df12c 100644 --- a/roles/st2chatops/meta/main.yml +++ b/roles/st2chatops/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - st2 - devops - chatops diff --git a/roles/st2chatops/tasks/main.yml b/roles/st2chatops/tasks/main.yml index 42346b0d..11faa591 100644 --- a/roles/st2chatops/tasks/main.yml +++ b/roles/st2chatops/tasks/main.yml @@ -82,7 +82,7 @@ - name: Generate authentication token command: st2 auth "{{ st2_auth_username }}" -p "{{ st2_auth_password }}" -t - when: task_apikey_not_exists is succeeded and task_user_st2_api_key.changed == false + when: task_apikey_not_exists is succeeded and task_user_st2_api_key.changed register: task_st2_token tags: [st2chatops, skip_ansible_lint] diff --git a/roles/st2mistral/meta/main.yml b/roles/st2mistral/meta/main.yml index c76f1a01..332a4373 100644 --- a/roles/st2mistral/meta/main.yml +++ b/roles/st2mistral/meta/main.yml @@ -15,7 +15,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - automation - devops - workflows diff --git a/roles/st2repo/meta/main.yml b/roles/st2repo/meta/main.yml index 1c6d4691..501285bd 100644 --- a/roles/st2repo/meta/main.yml +++ b/roles/st2repo/meta/main.yml @@ -14,7 +14,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - stackstorm - repositories - packagecloud diff --git a/roles/st2web/meta/main.yml b/roles/st2web/meta/main.yml index 383b7ccd..eadd1d51 100644 --- a/roles/st2web/meta/main.yml +++ b/roles/st2web/meta/main.yml @@ -15,7 +15,7 @@ galaxy_info: versions: - 6 - 7 - categories: + galaxy_tags: - system dependencies: - role: nginx From 4129f324343f19d7b1192b4e06fb566c109806ef Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 20 Dec 2018 13:48:23 -0800 Subject: [PATCH 2/4] Update roles/st2chatops/tasks/main.yml Co-Authored-By: LindsayHill --- roles/st2chatops/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/st2chatops/tasks/main.yml b/roles/st2chatops/tasks/main.yml index 11faa591..5692756c 100644 --- a/roles/st2chatops/tasks/main.yml +++ b/roles/st2chatops/tasks/main.yml @@ -82,7 +82,7 @@ - name: Generate authentication token command: st2 auth "{{ st2_auth_username }}" -p "{{ st2_auth_password }}" -t - when: task_apikey_not_exists is succeeded and task_user_st2_api_key.changed + when: task_apikey_not_exists is succeeded and task_user_st2_api_key is not changed register: task_st2_token tags: [st2chatops, skip_ansible_lint] From e2b79903cac53e6a75d724e8ea16b79b5f77de59 Mon Sep 17 00:00:00 2001 From: Eugen C Date: Thu, 20 Dec 2018 13:48:41 -0800 Subject: [PATCH 3/4] Update .circleci/config.yml Co-Authored-By: LindsayHill --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9207e098..6d8cfe79 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,4 +18,4 @@ jobs: - run: name: Ansible-lint check command: | - ansible-lint -x 204 -v roles/*/*/*.yml stackstorm.yml + ansible-lint -x 204 -v roles/*/*/*.yaml roles/*/*/*.yml stackstorm.yml From 561d3ed8bf0176aeeebb5046ad406d00047f3c77 Mon Sep 17 00:00:00 2001 From: Eugen C Date: Thu, 20 Dec 2018 13:49:07 -0800 Subject: [PATCH 4/4] Update roles/bwc/tasks/bwc_repos_setup.yml Co-Authored-By: LindsayHill --- roles/bwc/tasks/bwc_repos_setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bwc/tasks/bwc_repos_setup.yml b/roles/bwc/tasks/bwc_repos_setup.yml index e7fbe214..d398cef8 100644 --- a/roles/bwc/tasks/bwc_repos_setup.yml +++ b/roles/bwc/tasks/bwc_repos_setup.yml @@ -63,4 +63,4 @@ - ewc - enterprise register: bwc_repo_added - when: bwc_read_token + when: bwc_read_token | length > 0