From 267741550f3de75a576b7feced0b7b8abf660a93 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sun, 11 Oct 2020 12:21:13 -0400 Subject: [PATCH] Make ansible-lint happy --- .travis.yml | 1 + roles/awx/tasks/initialize.yml | 6 +++--- roles/awx/tasks/main.yml | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8dfa4297..ff795c06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ env: install: - pip3 install docker molecule==3.0.6 yamllint ansible-lint openshift jmespath + - ansible-galaxy collection install community.kubernetes script: - molecule test -s test-local diff --git a/roles/awx/tasks/initialize.yml b/roles/awx/tasks/initialize.yml index e0d828ba..a0676cdd 100644 --- a/roles/awx/tasks/initialize.yml +++ b/roles/awx/tasks/initialize.yml @@ -1,6 +1,6 @@ --- - name: Check if there are any super users defined. - k8s_exec: + community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ tower_pod_name }}" container: "{{ meta.name }}-task" @@ -14,7 +14,7 @@ changed_when: users_result.return_code > 0 - name: Create super user via Django if it doesn't exist. - k8s_exec: + community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ tower_pod_name }}" container: "{{ meta.name }}-task" @@ -26,7 +26,7 @@ no_log: true - name: Create preload data if necessary. # noqa 305 - k8s_exec: + community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ tower_pod_name }}" container: "{{ meta.name }}-task" diff --git a/roles/awx/tasks/main.yml b/roles/awx/tasks/main.yml index f8fd6c3b..f98cbfc7 100644 --- a/roles/awx/tasks/main.yml +++ b/roles/awx/tasks/main.yml @@ -89,7 +89,7 @@ fail_msg: "Could not find the tower pod's name." - name: Check if database is populated (auth_user table exists). - k8s_exec: + community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ tower_pod_name }}" container: "{{ meta.name }}-task" @@ -104,7 +104,7 @@ when: k8s_defs_result is not changed - name: Migrate the database if the K8s resources were updated. # noqa 305 - k8s_exec: + community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ tower_pod_name }}" container: "{{ meta.name }}-task" @@ -113,4 +113,4 @@ register: migrate_result when: (k8s_defs_result is changed) or (database_check is defined and database_check.return_code != 0) -- include_tasks: initialize.yml +#- i_tasks: initialize.yml