From 42af090a7cac8151ac8c9ec0f089998ccd31a1f4 Mon Sep 17 00:00:00 2001 From: Michael Collins Date: Sat, 9 Oct 2021 10:21:27 +0800 Subject: [PATCH] update naming scheme 1 --- .../surveys/configure_element.json.j2 | 16 +++++----- .../tasks/set_variables_element.yml | 32 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/roles/matrix-awx/surveys/configure_element.json.j2 b/roles/matrix-awx/surveys/configure_element.json.j2 index d962958d..10e7b63f 100755 --- a/roles/matrix-awx/surveys/configure_element.json.j2 +++ b/roles/matrix-awx/surveys/configure_element.json.j2 @@ -56,10 +56,10 @@ "required": false, "min": 0, "max": 1024, - "default": "{{ ext_matrix_client_element_welcome_logo }}", + "default": "{{ awx_matrix_client_element_welcome_logo }}", "choices": "", "new_question": true, - "variable": "ext_matrix_client_element_welcome_logo", + "variable": "awx_matrix_client_element_welcome_logo", "type": "text" }, { @@ -68,10 +68,10 @@ "required": false, "min": 0, "max": 1024, - "default": "{{ ext_matrix_client_element_welcome_logo_link }}", + "default": "{{ awx_matrix_client_element_welcome_logo_link }}", "choices": "", "new_question": true, - "variable": "ext_matrix_client_element_welcome_logo_link", + "variable": "awx_matrix_client_element_welcome_logo_link", "type": "text" }, { @@ -80,10 +80,10 @@ "required": false, "min": 0, "max": 512, - "default": "{{ ext_matrix_client_element_welcome_headline }}", + "default": "{{ awx_matrix_client_element_welcome_headline }}", "choices": "", "new_question": true, - "variable": "ext_matrix_client_element_welcome_headline", + "variable": "awx_matrix_client_element_welcome_headline", "type": "text" }, { @@ -92,10 +92,10 @@ "required": false, "min": 0, "max": 2048, - "default": "{{ ext_matrix_client_element_welcome_text }}", + "default": "{{ awx_matrix_client_element_welcome_text }}", "choices": "", "new_question": true, - "variable": "ext_matrix_client_element_welcome_text", + "variable": "awx_matrix_client_element_welcome_text", "type": "text" }, { diff --git a/roles/matrix-awx/tasks/set_variables_element.yml b/roles/matrix-awx/tasks/set_variables_element.yml index ebaedcaa..6d7d4006 100755 --- a/roles/matrix-awx/tasks/set_variables_element.yml +++ b/roles/matrix-awx/tasks/set_variables_element.yml @@ -21,10 +21,10 @@ line: "{{ item.key }}: {{ item.value }}" insertbefore: '# Custom Settings Start' with_dict: - 'ext_matrix_client_element_welcome_logo': '{{ ext_matrix_client_element_welcome_logo }}' - 'ext_matrix_client_element_welcome_logo_link': '{{ ext_matrix_client_element_welcome_logo_link }}' - 'ext_matrix_client_element_welcome_headline': '{{ ext_matrix_client_element_welcome_headline }}' - 'ext_matrix_client_element_welcome_text': '{{ ext_matrix_client_element_welcome_text }}' + 'awx_matrix_client_element_welcome_logo': '{{ awx_matrix_client_element_welcome_logo }}' + 'awx_matrix_client_element_welcome_logo_link': '{{ awx_matrix_client_element_welcome_logo_link }}' + 'awx_matrix_client_element_welcome_headline': '{{ awx_matrix_client_element_welcome_headline }}' + 'awx_matrix_client_element_welcome_text': '{{ awx_matrix_client_element_welcome_text }}' - name: Set fact for 'https' string set_fact: @@ -38,8 +38,8 @@ line: "{{ item.key }}: {{ item.value }}" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_logo': '{{ ext_matrix_client_element_welcome_logo }}' - when: ( awx_https_string in ext_matrix_client_element_welcome_logo ) and ( ext_matrix_client_element_welcome_logo|trim|length > 0 ) + '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 delegate_to: 127.0.0.1 @@ -47,7 +47,7 @@ path: '{{ awx_cached_matrix_vars }}' regexp: "^matrix_client_element_welcome_logo: " state: absent - when: ext_matrix_client_element_welcome_logo|trim|length == 0 + when: awx_matrix_client_element_welcome_logo|trim|length == 0 - name: Set custom logo link locally on AWX if defined delegate_to: 127.0.0.1 @@ -57,8 +57,8 @@ line: "{{ item.key }}: {{ item.value }}" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_logo_link': '{{ ext_matrix_client_element_welcome_logo_link }}' - when: ( awx_https_string in ext_matrix_client_element_welcome_logo_link ) and ( ext_matrix_client_element_welcome_logo_link|trim|length > 0 ) + '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 delegate_to: 127.0.0.1 @@ -66,7 +66,7 @@ path: '{{ awx_cached_matrix_vars }}' regexp: "^matrix_client_element_welcome_logo_link: " state: absent - when: ext_matrix_client_element_welcome_logo_link|trim|length == 0 + when: awx_matrix_client_element_welcome_logo_link|trim|length == 0 - name: Set custom headline locally on AWX if defined delegate_to: 127.0.0.1 @@ -76,8 +76,8 @@ line: "{{ item.key }}: {{ item.value }}" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_headline': '{{ ext_matrix_client_element_welcome_headline }}' - when: ext_matrix_client_element_welcome_headline|trim|length > 0 + '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 delegate_to: 127.0.0.1 @@ -85,7 +85,7 @@ path: '{{ awx_cached_matrix_vars }}' regexp: "^matrix_client_element_welcome_headline: " state: absent - when: ext_matrix_client_element_welcome_headline|trim|length == 0 + when: awx_matrix_client_element_welcome_headline|trim|length == 0 - name: Set custom text locally on AWX if defined delegate_to: 127.0.0.1 @@ -95,8 +95,8 @@ line: "{{ item.key }}: {{ item.value }}" insertafter: '# Element Settings Start' with_dict: - 'matrix_client_element_welcome_text': '{{ ext_matrix_client_element_welcome_text }}' - when: ext_matrix_client_element_welcome_text|trim|length > 0 + '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 delegate_to: 127.0.0.1 @@ -104,7 +104,7 @@ path: '{{ awx_cached_matrix_vars }}' regexp: "^matrix_client_element_welcome_text: " state: absent - when: ext_matrix_client_element_welcome_text|trim|length == 0 + when: awx_matrix_client_element_welcome_text|trim|length == 0 - name: Record Element-Web Background variable locally on AWX delegate_to: 127.0.0.1