merge upstream

2021-06-01 16:00:13 +08:00
parent 6f40d78353
commit ad7bbd6442
38 changed files with 496 additions and 45 deletions
--- a/roles/matrix-awx/tasks/main.yml
+++ b/roles/matrix-awx/tasks/main.yml
@ -98,6 +98,15 @@
  tags:
    - setup-client-element

+# Additional playbook to set the variable file during Element configuration
+- include_tasks: 
+    file: "set_variables_element_subdomain.yml"
+    apply:
+      tags: setup-client-element-subdomain
+  when: run_setup|bool and matrix_awx_enabled|bool
+  tags:
+    - setup-client-element-subdomain
+
 # Additional playbook to set the variable file during Synapse configuration
 - include_tasks: 
    file: "set_variables_synapse.yml"