Merge pull request #37 from IPvSean/master

adding execution environment support

galaxy.yml

@@ -38,7 +38,9 @@ build_ignore:
   - images
   - '*.tar.gz'
 
-dependencies: {}
+dependencies:
+  "awx.awx": "*"
+
 
 repository: http://github.com/ansible/product-demos
 documentation: http://github.com/ansible/product-demos

meta/runtime.yml

@@ -0,0 +1 @@
+requires_ansible: ">=2.11"

roles/install_demo/tasks/job_template.yml

@@ -20,6 +20,7 @@
       - "inventory: {{ job_template_definitions[demo].inventory }}"
       - "project: {{ job_template_definitions[demo].project.name }}"
       - "playbook: {{ job_template_definitions[demo].playbook }}"
+      - "execution_environment: {{ job_template_definitions[demo].execution_environment | Default('Default execution environment') }}"
       - "fact_caching_enabled: {{ job_template_definitions[demo].fact_caching_enabled | default('false') }}"
       - "credential: {{ job_template_definitions[demo].credential }}"
       - "survey_enabled: {{ job_template_definitions[demo].survey_enabled  | default('false')  }}"
@@ -33,6 +34,7 @@
     inventory: "{{ job_template_definitions[demo].inventory }}"
     project: "{{ job_template_definitions[demo].project.name }}"
     playbook: "{{ job_template_definitions[demo].playbook }}"
+    execution_environment: "{{ job_template_definitions[demo].execution_environment | default('Default execution environment') }}"
     fact_caching_enabled: "{{ job_template_definitions[demo].fact_caching_enabled | default('false') }}"
     credential: "{{ job_template_definitions[demo].credential }}"
     survey_enabled: "{{ job_template_definitions[demo].survey_enabled }}"
@@ -55,6 +57,7 @@
     inventory: "{{ job_template_definitions[demo].inventory }}"
     project: "{{ job_template_definitions[demo].project.name }}"
     playbook: "{{ job_template_definitions[demo].playbook }}"
+    execution_environment: "{{ job_template_definitions[demo].execution_environment | default('Default execution environment') }}"
     fact_caching_enabled: "{{ job_template_definitions[demo].fact_caching_enabled | default('false') }}"
     credential: "{{ job_template_definitions[demo].credential }}"
     survey_enabled: "{{ job_template_definitions[demo].survey_enabled }}"

roles/install_demo/tasks/job_template_loop.yml

@@ -27,6 +27,7 @@
         inventory: "{{ item.value.inventory }}"
         project: "{{ item.value.project.name }}"
         playbook: "{{ item.value.playbook }}"
+        execution_environment: "{{ item.value.execution_environment | default('Default execution environment') }}"
         fact_caching_enabled: "{{ item.value.fact_caching_enabled | default('false') }}"
         credential: "{{ item.value.credential }}"
         survey_enabled: "{{ item.value.survey_enabled }}"
@@ -49,6 +50,7 @@
         inventory: "{{ item.value.inventory }}"
         project: "{{ item.value.project.name }}"
         playbook: "{{ item.value.playbook }}"
+        execution_environment: "{{ item.value.execution_environment | default('Default execution environment') }}"
         fact_caching_enabled: "{{ item.value.fact_caching_enabled | default('false') }}"
         credential: "{{ item.value.credential }}"
         survey_enabled: "{{ item.value.survey_enabled }}"

roles/install_demo/vars/main/security/hardening.yml

@@ -9,6 +9,7 @@ hardening:
   playbook: "playbooks/security/hardening.yml"
   credential: "Workshop Credential"
   survey_enabled: true
+  execution_environment: "Default execution environment"
   survey_spec:
     name: ''
     description: ''