From 89c8ae94d632f5c70ff5223c38ac8b5b22d4e039 Mon Sep 17 00:00:00 2001 From: Michael Collins Date: Sun, 10 Oct 2021 16:16:31 +0800 Subject: [PATCH] update --- roles/matrix-awx/tasks/backup_server.yml | 4 ++-- .../tasks/set_variables_dimension.yml | 4 ++-- .../tasks/set_variables_element.yml | 20 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/roles/matrix-awx/tasks/backup_server.yml b/roles/matrix-awx/tasks/backup_server.yml index 7ef861948..d33f0f704 100644 --- a/roles/matrix-awx/tasks/backup_server.yml +++ b/roles/matrix-awx/tasks/backup_server.yml @@ -93,8 +93,8 @@ - name: Set boolean value to exit playbook set_fact: - end_playbook: true + awx_end_playbook: true - name: End playbook if this task list is called. meta: end_play - when: end_playbook is defined and end_playbook|bool + when: awx_end_playbook is defined and awx_end_playbook|bool diff --git a/roles/matrix-awx/tasks/set_variables_dimension.yml b/roles/matrix-awx/tasks/set_variables_dimension.yml index 65400bbc0..d5e51c6bc 100644 --- a/roles/matrix-awx/tasks/set_variables_dimension.yml +++ b/roles/matrix-awx/tasks/set_variables_dimension.yml @@ -31,12 +31,12 @@ - name: Set final users list if users are defined set_fact: awx_dimension_users_final: "{{ awx_dimension_users }}" - when: awx_dimension_users|length > 0 + when: awx_dimension_users | length > 0 - name: Set final users list if no users are defined set_fact: awx_dimension_users_final: '@dimension:{{ matrix_domain }}' - when: awx_dimension_users|length == 0 + when: awx_dimension_users | length == 0 - name: Remove Dimension Users delegate_to: 127.0.0.1 diff --git a/roles/matrix-awx/tasks/set_variables_element.yml b/roles/matrix-awx/tasks/set_variables_element.yml index 70c59020c..c3ed2ead1 100755 --- a/roles/matrix-awx/tasks/set_variables_element.yml +++ b/roles/matrix-awx/tasks/set_variables_element.yml @@ -23,10 +23,10 @@ lineinfile: path: '{{ awx_cached_matrix_vars }}' regexp: "^#? *{{ item.key | regex_escape() }}:" - line: "{{ item.key }}: {{ item.value }}" + line: "{{ item.key }}: '{{ item.value }}'" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}' + 'matrix_client_element_welcome_logo': "'{{ awx_matrix_client_element_welcome_logo }}'" when: ( awx_https_string in awx_matrix_client_element_welcome_logo ) and ( awx_matrix_client_element_welcome_logo | trim | length > 0 ) - name: Remove custom logo locally on AWX if not defined @@ -42,10 +42,10 @@ lineinfile: path: '{{ awx_cached_matrix_vars }}' regexp: "^#? *{{ item.key | regex_escape() }}:" - line: "{{ item.key }}: {{ item.value }}" + line: "{{ item.key }}: '{{ item.value }}'" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}' + 'matrix_client_element_welcome_logo_link': "'{{ awx_matrix_client_element_welcome_logo_link }}'" when: ( awx_https_string in awx_matrix_client_element_welcome_logo_link ) and ( awx_matrix_client_element_welcome_logo_link | trim | length > 0 ) - name: Remove custom logo link locally on AWX if not defined @@ -61,10 +61,10 @@ lineinfile: path: '{{ awx_cached_matrix_vars }}' regexp: "^#? *{{ item.key | regex_escape() }}:" - line: "{{ item.key }}: {{ item.value }}" + line: "{{ item.key }}: '{{ item.value }}'" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}' + 'matrix_client_element_welcome_headline': "'{{ awx_matrix_client_element_welcome_headline }}'" when: awx_matrix_client_element_welcome_headline | trim | length > 0 - name: Remove custom headline locally on AWX if not defined @@ -80,10 +80,10 @@ lineinfile: path: '{{ awx_cached_matrix_vars }}' regexp: "^#? *{{ item.key | regex_escape() }}:" - line: "{{ item.key }}: {{ item.value }}" + line: "{{ item.key }}: '{{ item.value }}'" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}' + 'matrix_client_element_welcome_text': "'{{ awx_matrix_client_element_welcome_text }}'" when: awx_matrix_client_element_welcome_text | trim | length > 0 - name: Remove custom text locally on AWX if not defined @@ -99,10 +99,10 @@ lineinfile: path: '{{ awx_cached_matrix_vars }}' regexp: "^#? *{{ item.key | regex_escape() }}:" - line: "{{ item.key }}: {{ item.value }}" + line: "{{ item.key }}: '{{ item.value }}'" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_branding_welcomeBackgroundUrl': '{{ matrix_client_element_branding_welcomeBackgroundUrl }}' + 'matrix_client_element_branding_welcomeBackgroundUrl': "'{{ matrix_client_element_branding_welcomeBackgroundUrl }}'" when: ( awx_https_string in matrix_client_element_branding_welcomeBackgroundUrl ) and ( matrix_client_element_branding_welcomeBackgroundUrl | length > 0 ) - name: Save new 'Configure Element' survey.json to the AWX tower, template