From 179fab9b60782e9076823d3f5bd34c40490fa8f8 Mon Sep 17 00:00:00 2001 From: ipvsean Date: Wed, 20 May 2020 19:06:30 -0400 Subject: [PATCH] adding all demos to demo mode also fixing windows IIS server demo --- roles/install_demo/vars/main/developer/developer_report.yml | 1 + roles/install_demo/vars/main/infrastructure/debug_info.yml | 1 + .../vars/main/infrastructure/deploy_application.yml | 1 + roles/install_demo/vars/main/infrastructure/grant_sudo.yml | 1 + roles/install_demo/vars/main/infrastructure/insights.yml | 1 + roles/install_demo/vars/main/infrastructure/patching.yml | 1 + roles/install_demo/vars/main/infrastructure/scan_facts.yml | 1 + .../vars/main/infrastructure/security_patching.yml | 1 + roles/install_demo/vars/main/infrastructure/windows_iss.yml | 3 ++- roles/install_demo/vars/main/network/configlet_logging.yml | 1 + roles/install_demo/vars/main/network/configlet_ntp.yml | 1 + roles/install_demo/vars/main/network/f5_bigip_workflow.yml | 5 +++++ roles/install_demo/vars/main/security/hardening.yml | 1 + roles/install_demo/vars/main/security/openscap.yml | 1 + 14 files changed, 19 insertions(+), 1 deletion(-) diff --git a/roles/install_demo/vars/main/developer/developer_report.yml b/roles/install_demo/vars/main/developer/developer_report.yml index a036019..62711f5 100644 --- a/roles/install_demo/vars/main/developer/developer_report.yml +++ b/roles/install_demo/vars/main/developer/developer_report.yml @@ -21,3 +21,4 @@ developer_report: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/debug_info.yml b/roles/install_demo/vars/main/infrastructure/debug_info.yml index 3c2ff83..ed143ec 100644 --- a/roles/install_demo/vars/main/infrastructure/debug_info.yml +++ b/roles/install_demo/vars/main/infrastructure/debug_info.yml @@ -27,3 +27,4 @@ debug_info: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/deploy_application.yml b/roles/install_demo/vars/main/infrastructure/deploy_application.yml index 81ebcae..5c69423 100644 --- a/roles/install_demo/vars/main/infrastructure/deploy_application.yml +++ b/roles/install_demo/vars/main/infrastructure/deploy_application.yml @@ -36,3 +36,4 @@ deploy_application: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/grant_sudo.yml b/roles/install_demo/vars/main/infrastructure/grant_sudo.yml index c9774fc..209d1e0 100644 --- a/roles/install_demo/vars/main/infrastructure/grant_sudo.yml +++ b/roles/install_demo/vars/main/infrastructure/grant_sudo.yml @@ -45,3 +45,4 @@ grant_sudo: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/insights.yml b/roles/install_demo/vars/main/infrastructure/insights.yml index f052ef1..8a84ed6 100644 --- a/roles/install_demo/vars/main/infrastructure/insights.yml +++ b/roles/install_demo/vars/main/infrastructure/insights.yml @@ -31,3 +31,4 @@ insights: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/patching.yml b/roles/install_demo/vars/main/infrastructure/patching.yml index c1dc1c3..fa83da7 100644 --- a/roles/install_demo/vars/main/infrastructure/patching.yml +++ b/roles/install_demo/vars/main/infrastructure/patching.yml @@ -27,3 +27,4 @@ patching: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/scan_facts.yml b/roles/install_demo/vars/main/infrastructure/scan_facts.yml index 276aa75..70b0c66 100644 --- a/roles/install_demo/vars/main/infrastructure/scan_facts.yml +++ b/roles/install_demo/vars/main/infrastructure/scan_facts.yml @@ -21,3 +21,4 @@ fact_scan: - rhel - windows - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/security_patching.yml b/roles/install_demo/vars/main/infrastructure/security_patching.yml index 3279b4b..c4fdd2a 100644 --- a/roles/install_demo/vars/main/infrastructure/security_patching.yml +++ b/roles/install_demo/vars/main/infrastructure/security_patching.yml @@ -27,3 +27,4 @@ security_patching: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/infrastructure/windows_iss.yml b/roles/install_demo/vars/main/infrastructure/windows_iss.yml index 2e35ecf..b63bb17 100644 --- a/roles/install_demo/vars/main/infrastructure/windows_iss.yml +++ b/roles/install_demo/vars/main/infrastructure/windows_iss.yml @@ -7,7 +7,7 @@ windows_iis: job_type: "run" inventory: "Workshop Inventory" playbook: "playbooks/infrastructure/windows_iis.yml" - credential: "Demo Credential" + credential: "Workshop Credential" survey_enabled: false project: name: "Ansible official demo project" @@ -17,3 +17,4 @@ windows_iis: scm_url: "https://github.com/ansible/product-demos" workshop_type: - windows + - demo diff --git a/roles/install_demo/vars/main/network/configlet_logging.yml b/roles/install_demo/vars/main/network/configlet_logging.yml index 08adc52..fe547bc 100644 --- a/roles/install_demo/vars/main/network/configlet_logging.yml +++ b/roles/install_demo/vars/main/network/configlet_logging.yml @@ -18,3 +18,4 @@ configlet_logging: scm_url: "https://github.com/ansible/product-demos" workshop_type: - network + - demo diff --git a/roles/install_demo/vars/main/network/configlet_ntp.yml b/roles/install_demo/vars/main/network/configlet_ntp.yml index 0dcb917..41e4613 100644 --- a/roles/install_demo/vars/main/network/configlet_ntp.yml +++ b/roles/install_demo/vars/main/network/configlet_ntp.yml @@ -18,3 +18,4 @@ configlet_ntp: scm_url: "https://github.com/ansible/product-demos" workshop_type: - network + - demo diff --git a/roles/install_demo/vars/main/network/f5_bigip_workflow.yml b/roles/install_demo/vars/main/network/f5_bigip_workflow.yml index 74997e2..e3d9932 100644 --- a/roles/install_demo/vars/main/network/f5_bigip_workflow.yml +++ b/roles/install_demo/vars/main/network/f5_bigip_workflow.yml @@ -8,6 +8,7 @@ f5_bigip_workflow: organization: 'Default' workshop_type: - f5 + - demo schema: - job_template: 'F5 - add nodes' success: @@ -33,6 +34,7 @@ f5_bigip_workflow: scm_url: 'https://github.com/ansible/workshops' workshop_type: - f5 + - demo f5_add_pool: name: 'F5 - add pool' description: 'add webserver nodes into F5 BIG-IP' @@ -49,6 +51,7 @@ f5_bigip_workflow: scm_url: 'https://github.com/ansible/workshops' workshop_type: - f5 + - demo f5_add_pool_members: name: 'F5 - add pool members' description: 'add webserver nodes into pool' @@ -65,6 +68,7 @@ f5_bigip_workflow: scm_url: 'https://github.com/ansible/workshops' workshop_type: - f5 + - demo f5_add_vip: name: 'F5 - add virtual server' description: 'create VIP and add pool to virtual server' @@ -81,3 +85,4 @@ f5_bigip_workflow: scm_url: 'https://github.com/ansible/workshops' workshop_type: - f5 + - demo diff --git a/roles/install_demo/vars/main/security/hardening.yml b/roles/install_demo/vars/main/security/hardening.yml index 285cd26..af4562b 100644 --- a/roles/install_demo/vars/main/security/hardening.yml +++ b/roles/install_demo/vars/main/security/hardening.yml @@ -55,3 +55,4 @@ hardening: - f5 - rhel - rhel_90 + - demo diff --git a/roles/install_demo/vars/main/security/openscap.yml b/roles/install_demo/vars/main/security/openscap.yml index 8287b42..8435e64 100644 --- a/roles/install_demo/vars/main/security/openscap.yml +++ b/roles/install_demo/vars/main/security/openscap.yml @@ -19,3 +19,4 @@ openscap: - f5 - rhel - rhel_90 + - demo