Skip to content

Commit

Permalink
Make ansible-lint happy
Browse files Browse the repository at this point in the history
  • Loading branch information
shanemcd committed Oct 11, 2020
1 parent 8b68131 commit 2677415
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions roles/awx/tasks/initialize.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions roles/awx/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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

0 comments on commit 2677415

Please sign in to comment.