cleanup setup files and fix things

collections/requirements.yml

@@ -5,8 +5,10 @@ collections:
   - name: redhat_cop.controller_configuration
     version: 2.1.1
   #linux
-  - redhat.insights
-  - redhat.rhel_system_roles
+  - name: redhat.insights
+    version: 1.0.7
+  - name: redhat.rhel_system_roles
+    version: 1.16.2
   - community.general
   - containers.podman
   #windows

linux/setup.yml

@@ -262,8 +262,4 @@ controller_templates:
         - question_name: Server Name or Pattern
           type: text
           variable: HOSTS
-          required: true
-        - question_name: Web Page Message
-          type: textarea
-          variable: message
           required: true

linux/system_roles.yml

@@ -7,7 +7,7 @@
   tasks:
     - name: Apply System Roles
       include_role:
-        name: "redhat_cop.controller_configuration.{{ item }}"
+        name: "redhat.rhel_system_roles.{{ item }}"
       loop: "{{ system_roles }}"
       when:
         - system_roles | d("") | length > 0

windows/setup.yml

@@ -1,13 +1,10 @@
 ---
 user_message: |
-  You will need to update SNOW credentials with your SNOW instance details if you plan to demo this.
+  ''
 
 controller_components:
   - projects
-  - credential_types
-  - credentials
   - job_templates
-  #- workflow_job_templates
 
 controller_projects:
   - name: Fact Scan
@@ -15,42 +12,6 @@ controller_projects:
     scm_type: git
     scm_url: 'https://github.com/ansible/awx-facts-playbooks.git'
 
-controller_credential_types:
-  - name: "SNOW Credential Type"
-    description: "credential to store SNOW"
-    kind: cloud
-    inputs:
-      fields:
-        - id: SNOW_USERNAME
-          type: string
-          label: Service Now Username
-        - id: SNOW_INSTANCE
-          type: string
-          label: Service Now Instance Name (devXXXXX)
-        - id: SNOW_PASSWORD
-          type: string
-          label: Service Now Password
-          secret: true
-      required:
-        - SNOW_USERNAME
-        - SNOW_INSTANCE
-        - SNOW_PASSWORD
-    injectors:
-      extra_vars:
-        snow_username: "{% raw %}{  { SNOW_USERNAME  }}{% endraw %}"
-        snow_password: "{% raw %}{  { SNOW_PASSWORD  }}{% endraw %}"
-        snow_instance: "{% raw %}{  { SNOW_INSTANCE  }}{% endraw %}"
-
-controller_credentials:
-- name: SNOW Credential
-  description: Credentials
-  organization: Default
-  credential_type: "SNOW Credential Type"
-  inputs:
-    SNOW_USERNAME: "admin" #update after install
-    SNOW_PASSWORD: "XXX"   #update after install
-    SNOW_INSTANCE: "devXxxxx" #update after install
-
 controller_templates:
   - name: "WINDOWS / Install IIS"
     job_type: run
@@ -283,166 +244,4 @@ controller_templates:
           type: text
           variable: telephone_number
           default: 555-123456
-          required: false
-
-  - name: "Rollback"
-    job_type: run
-    inventory: "Workshop Inventory"
-    limit: "student1-win1"
-    project: "Ansible official demo project"
-    playbook: "windows/backup.yml"
-    execution_environment: "windows workshop execution environment"
-    credentials:
-    - "Workshop Credential"
-
-  - name: "Open SNOW Change Request"
-    job_type: run
-    inventory: "Workshop Inventory"
-    limit: "student1-ansible-1"
-    project: "Ansible official demo project"
-    playbook: "windows/snow.yml"
-    credentials:
-    - "SNOW Credential"
-    - "Workshop Credential"
-
-  - name: "Send Completion Notification"
-    job_type: run
-    inventory: "Workshop Inventory"
-    limit: "student1-win1"
-    project: "Ansible official demo project"
-    playbook: "windows/backup.yml"
-    execution_environment: "windows workshop execution environment"
-    credentials:
-    - "Workshop Credential"
-
-  - name: "Alert Ops!"
-    job_type: run
-    inventory: "Workshop Inventory"
-    limit: "student1-win1"
-    project: "Ansible official demo project"
-    playbook: "windows/backup.yml"
-    execution_environment: "windows workshop execution environment"
-    credentials:
-    - "Workshop Credential"
-
-controller_workflows:
-  - name: "Windows Demo Workflow"
-    organization:
-      name: "Default"
-    workflow_nodes:
-      - unified_job_template:
-          name: "Ansible official demo project"
-          type: project_update
-          organization:
-            name: "Default"
-        identifier: node100
-        related:
-          success_nodes:
-          - identifier: node101
-      - unified_job_template:
-          name: "Open SNOW Change Request"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node101
-        related:
-          success_nodes:
-          - identifier: node201
-      - unified_job_template:
-          name: "WINDOWS / Windows updates"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node201
-        related:
-          success_nodes:
-          - identifier: node301
-          failure_nodes:
-          - identifier: node302
-          always_nodes: []
-      - unified_job_template:
-          name: "WINDOWS / Install IIS"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node301
-        related:
-          success_nodes:
-            - identifier: node401
-          failure_nodes:
-            - identifier: node402
-          always_nodes: []
-      - unified_job_template:
-          name: "Rollback"
-          type: workflow_approval
-          organization:
-            name: "Default"
-        related:
-          success_nodes: []
-          failure_nodes: []
-          always_nodes: []
-        identifier: node302
-      - unified_job_template:
-          name: "WINDOWS / Chocolatey install multiple"
-          type: workflow_approval
-          organization:
-            name: "Default"
-        identifier: node401
-        related:
-          success_nodes:
-            - identifier: node501
-          failure_nodes:
-            - identifier: node502
-          always_nodes: []
-      - unified_job_template:
-          name: "Rollback"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node402
-        related:
-          success_nodes: []
-          failure_nodes: []
-          always_nodes: []
-      - unified_job_template:
-          name: "Send Completion Notification"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node501
-        related:
-          success_nodes: []
-          failure_nodes: []
-          always_nodes: []
-      - unified_job_template:
-          name: "Manual override"
-          type: workflow_approval
-          organization:
-            name: "Default"
-        related:
-          success_nodes:
-            - identifier: node601
-          failure_nodes:
-            - identifier: node602
-          always_nodes: []
-        identifier: node502
-      - unified_job_template:
-          name: "Rollback"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node602
-        related:
-          success_nodes: []
-          failure_nodes: []
-          always_nodes: []
-      - unified_job_template:
-          name: "Alert Ops!"
-          type: job_template
-          organization:
-            name: "Default"
-        identifier: node601
-        related:
-          success_nodes: []
-          failure_nodes: []
-          always_nodes: []
+          required: false