From 94a4861d13f3bc10d90028b007a628310f04d847 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Wed, 17 Mar 2021 22:13:46 -0400 Subject: [PATCH] Bulk removal of no_log statements The operator would be impossible to debug with these --- roles/installer/tasks/admin_password_configuration.yml | 4 ---- .../installer/tasks/broadcast_websocket_configuration.yml | 4 ---- roles/installer/tasks/database_configuration.yml | 7 ------- roles/installer/tasks/initialize.yml | 1 - roles/installer/tasks/migrate_data.yml | 1 - roles/installer/tasks/secret_key_configuration.yml | 6 ------ 6 files changed, 23 deletions(-) diff --git a/roles/installer/tasks/admin_password_configuration.yml b/roles/installer/tasks/admin_password_configuration.yml index 51b35664..9f58e966 100644 --- a/roles/installer/tasks/admin_password_configuration.yml +++ b/roles/installer/tasks/admin_password_configuration.yml @@ -13,12 +13,10 @@ namespace: '{{ meta.namespace }}' name: '{{ meta.name }}-admin-password' register: _default_admin_password - no_log: true - name: Set admin password secret set_fact: _admin_password_secret: '{{ _custom_admin_password["resources"] | default([]) | length | ternary(_custom_admin_password, _default_admin_password) }}' - no_log: true - block: - name: Create admin password secret @@ -38,9 +36,7 @@ - name: Set admin password secret set_fact: admin_password_secret: '{{ _generated_admin_password["resources"] | default([]) | length | ternary(_generated_admin_password, _admin_password_secret) }}' - no_log: true - name: Store admin password set_fact: tower_admin_password: "{{ admin_password_secret['resources'][0]['data']['password'] | b64decode }}" - no_log: true diff --git a/roles/installer/tasks/broadcast_websocket_configuration.yml b/roles/installer/tasks/broadcast_websocket_configuration.yml index 4bae70a5..e4b387ce 100644 --- a/roles/installer/tasks/broadcast_websocket_configuration.yml +++ b/roles/installer/tasks/broadcast_websocket_configuration.yml @@ -13,13 +13,11 @@ namespace: '{{ meta.namespace }}' name: '{{ meta.name }}-broadcast-websocket' register: _default_broadcast_websocket - no_log: true - name: Set broadcast websocket secret set_fact: # yamllint disable-line rule:line-length _broadcast_websocket_secret: '{{ _custom_broadcast_websocket["resources"] | default([]) | length | ternary(_custom_broadcast_websocket, _default_broadcast_websocket) }}' # noqa 204 - no_log: true - block: - name: Create broadcast websocket secret @@ -40,9 +38,7 @@ set_fact: # yamllint disable-line rule:line-length broadcast_websocket_secret: '{{ _generated_broadcast_websocket["resources"] | default([]) | length | ternary(_generated_broadcast_websocket, _broadcast_websocket_secret) }}' # noqa 204 - no_log: true - name: Store broadcast websocket secret name set_fact: broadcast_websocket_secret_value: "{{ broadcast_websocket_secret['resources'][0]['data']['secret'] | b64decode }}" - no_log: true diff --git a/roles/installer/tasks/database_configuration.yml b/roles/installer/tasks/database_configuration.yml index 14985e66..899a3a0a 100644 --- a/roles/installer/tasks/database_configuration.yml +++ b/roles/installer/tasks/database_configuration.yml @@ -6,7 +6,6 @@ name: '{{ tower_postgres_configuration_secret }}' register: _custom_pg_config_resources when: tower_postgres_configuration_secret | length - no_log: true - name: Check for default PostgreSQL configuration k8s_info: @@ -14,12 +13,10 @@ namespace: '{{ meta.namespace }}' name: '{{ meta.name }}-postgres-configuration' register: _default_pg_config_resources - no_log: true - name: Set PostgreSQL configuration set_fact: _pg_config: '{{ _custom_pg_config_resources["resources"] | default([]) | length | ternary(_custom_pg_config_resources, _default_pg_config_resources) }}' - no_log: true - block: - name: Create Database configuration @@ -34,12 +31,10 @@ name: '{{ meta.name }}-postgres-configuration' register: _generated_pg_config_resources when: not _pg_config['resources'] | default([]) | length - no_log: true - name: Set PostgreSQL Configuration set_fact: pg_config: '{{ _generated_pg_config_resources["resources"] | default([]) | length | ternary(_generated_pg_config_resources, _pg_config) }}' - no_log: true - name: Create Database if no database is specified k8s: @@ -47,7 +42,6 @@ definition: "{{ lookup('template', 'tower_postgres.yaml.j2') }}" when: - pg_config['resources'][0]['data']['type'] | default('') | b64decode == 'managed' - no_log: true - name: Store Database Configuration set_fact: @@ -56,7 +50,6 @@ awx_postgres_database: "{{ pg_config['resources'][0]['data']['database'] | b64decode }}" awx_postgres_port: "{{ pg_config['resources'][0]['data']['port'] | b64decode }}" awx_postgres_host: "{{ pg_config['resources'][0]['data']['host'] | b64decode }}" - no_log: true - name: Check to see if this instance has already been migrated k8s_info: diff --git a/roles/installer/tasks/initialize.yml b/roles/installer/tasks/initialize.yml index a0676cdd..62849d7e 100644 --- a/roles/installer/tasks/initialize.yml +++ b/roles/installer/tasks/initialize.yml @@ -23,7 +23,6 @@ User.objects.create_superuser('{{ tower_admin_user }}', '{{ tower_admin_email }}', '{{ tower_admin_password }}')\" | awx-manage shell" when: users_result.return_code > 0 - no_log: true - name: Create preload data if necessary. # noqa 305 community.kubernetes.k8s_exec: diff --git a/roles/installer/tasks/migrate_data.yml b/roles/installer/tasks/migrate_data.yml index 405c91a0..7fcb2038 100644 --- a/roles/installer/tasks/migrate_data.yml +++ b/roles/installer/tasks/migrate_data.yml @@ -7,7 +7,6 @@ tower_old_postgres_database: "{{ old_pg_config['resources'][0]['data']['database'] | b64decode }}" tower_old_postgres_port: "{{ old_pg_config['resources'][0]['data']['port'] | b64decode }}" tower_old_postgres_host: "{{ old_pg_config['resources'][0]['data']['host'] | b64decode }}" - no_log: true - name: Get the postgres pod information k8s_info: diff --git a/roles/installer/tasks/secret_key_configuration.yml b/roles/installer/tasks/secret_key_configuration.yml index 8d27f81f..2769126c 100644 --- a/roles/installer/tasks/secret_key_configuration.yml +++ b/roles/installer/tasks/secret_key_configuration.yml @@ -6,7 +6,6 @@ name: '{{ tower_secret_key_secret }}' register: _custom_secret_key when: tower_secret_key_secret | length - no_log: true - name: Check for default secret key configuration k8s_info: @@ -18,14 +17,12 @@ - name: Set secret key secret set_fact: _secret_key_secret: '{{ _custom_secret_key["resources"] | default([]) | length | ternary(_custom_secret_key, _default_secret_key) }}' - no_log: true - block: - name: Create secret key secret k8s: apply: true definition: "{{ lookup('template', 'tower_secret_key.yaml.j2') }}" - no_log: true - name: Read secret key secret k8s_info: @@ -33,16 +30,13 @@ namespace: '{{ meta.namespace }}' name: '{{ meta.name }}-secret-key' register: _generated_secret_key - no_log: true when: not _secret_key_secret['resources'] | default([]) | length - name: Set secret key secret set_fact: secret_key_secret: '{{ _generated_secret_key["resources"] | default([]) | length | ternary(_generated_secret_key, _secret_key_secret) }}' - no_log: true - name: Store secret key secret name set_fact: secret_key_secret_name: "{{ secret_key_secret['resources'][0]['metadata']['name'] }}" - no_log: true