merge with upstream and testing branch

2021-04-04 11:41:06 +08:00
parent 179edb2c06
commit fbe22289bd
19 changed files with 333 additions and 151 deletions
--- a/roles/matrix-awx/tasks/load_hosting_and_org_variables.yml
+++ b/roles/matrix-awx/tasks/load_hosting_and_org_variables.yml
@ -8,3 +8,4 @@
  include_vars:
    file: '/var/lib/awx/projects/hosting/hosting_vars.yml'
  no_log: True
+