From 7d6743c44dcc7f7ba792b5b914476d3e44685b16 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 18 Mar 2021 12:59:18 -0400 Subject: [PATCH] Fix linter --- .ansible-lint | 1 + roles/installer/tasks/database_configuration.yml | 4 ++-- roles/installer/tasks/migrate_data.yml | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index 56e6654c..712a34e0 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -1,3 +1,4 @@ +--- skip_list: - '306' - '602' diff --git a/roles/installer/tasks/database_configuration.yml b/roles/installer/tasks/database_configuration.yml index 78d9d463..622bbc7a 100644 --- a/roles/installer/tasks/database_configuration.yml +++ b/roles/installer/tasks/database_configuration.yml @@ -69,8 +69,8 @@ - name: Look up details for this deployment k8s_info: - api_version: 'v1beta1' # TODO: How to parameterize this? - kind: "AWX" # TODO: How to parameterize this? + api_version: 'v1beta1' # TODO: How to parameterize this? + kind: "AWX" # TODO: How to parameterize this? name: "{{ meta.name }}" namespace: "{{ meta.namespace }}" register: this_awx diff --git a/roles/installer/tasks/migrate_data.yml b/roles/installer/tasks/migrate_data.yml index 7fcb2038..ae04e8ca 100644 --- a/roles/installer/tasks/migrate_data.yml +++ b/roles/installer/tasks/migrate_data.yml @@ -60,8 +60,12 @@ community.kubernetes.k8s_exec: namespace: "{{ meta.namespace }}" pod: "{{ postgres_pod_name }}" - command: >- - bash -c "set -o pipefail; PGPASSWORD={{ tower_old_postgres_pass }} {{ pgdump }} | PGPASSWORD={{ awx_postgres_pass }} {{ psql_restore }} && echo 'Successful'" + command: | + bash -c """ + set -e -o pipefail + PGPASSWORD={{ tower_old_postgres_pass }} {{ pgdump }} | PGPASSWORD={{ awx_postgres_pass }} {{ psql_restore }} + echo 'Successful' + """ register: data_migration failed_when: "'Successful' not in data_migration.stdout"