merge from main

2023-03-13 10:34:14 -04:00
parent 4897123870 ac5cf8401a
commit c9ee59d2f1
11 changed files with 795 additions and 222 deletions
--- a/satellite/setup.yml
+++ b/satellite/setup.yml
@@ -6,7 +6,7 @@ controller_components:
  - inventory_sources
  - job_templates
  - job_launch
-#  - workflow_job_templates
+  - workflow_job_templates

 controller_credential_types:
  - name: Satellite Collection
@@ -51,148 +51,149 @@ controller_credentials:
      password: ansible123!

 controller_inventory_sources:
-  - name: Satellite Inventory
-    inventory: Workshop Inventory
-    credential: Satellite Inventory
-    source: satellite6
-    update_on_launch: false
-    execution_environment: Control Plane Execution Environment
-    overwrite: true
-    source_vars:
-      hostnames:
-        - name.split('.')[0]
-      groups:
-        patch_bugs: foreman_content_facet_attributes.errata_counts.bugfix
-        patch_enhancements: foreman_content_facet_attributes.errata_counts.enhancement
-        patch_security: foreman_content_facet_attributes.errata_counts.security
-      keyed_groups:
-        - prefix: env
-          key: foreman_content_facet_attributes.lifecycle_environment_name
-        - prefix: cv
-          key: foreman_content_facet_attributes.content_view_name
-        - prefix: os
-          key: foreman_operatingsystem_name
-        - prefix: scap
-          key: foreman_compliance_status_label
-      validate_certs: false
+- name: Satellite Inventory
+  inventory: Workshop Inventory
+  credential: Satellite Inventory
+  source: satellite6
+  update_on_launch: false
+  execution_environment: Control Plane Execution Environment
+  overwrite: true
+  source_vars:
+    hostnames:
+      - name.split('.')[0]
+    groups:
+      patch_bugs: foreman_content_attributes.errata_counts.bugfix
+      patch_enhancements: foreman_content_attributes.errata_counts.enhancement
+      patch_security: foreman_content_attributes.errata_counts.security
+    keyed_groups:
+      - prefix: env
+        key: foreman_content_attributes.lifecycle_environment_name
+      - prefix: cv
+        key: foreman_content_attributes.content_view_name
+      - prefix: os
+        key: foreman_operatingsystem_name
+      - prefix: scap
+        key: foreman_compliance_status_label
+    validate_certs: false
+    group_prefix: satellite_

 controller_templates:
-  - name: LINUX / Register with Satellite
-    project: Ansible official demo project
-    playbook: satellite/server_register.yml
-    inventory: Workshop Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    credentials:
-      - Workshop Credential
-      - Satellite Credential
-    extra_vars:
-      org_id: "Default_Organization"
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Server Name or Pattern
-          type: text
-          variable: _hosts
-          required: false
-        - question_name: Choose Environment
-          type: multiplechoice
-          variable: env
-          choices:
-            - Dev
-            - QA
-            - Prod
-          required: true
+- name: LINUX / Register with Satellite
+  project: Ansible official demo project
+  playbook: satellite/server_register.yml
+  inventory: Workshop Inventory
+  notification_templates_started: Telemetry
+  notification_templates_success: Telemetry
+  notification_templates_error: Telemetry
+  credentials:
+    - Workshop Credential
+    - Satellite Credential
+  extra_vars:
+    org_id: "Default_Organization"
+  survey_enabled: true
+  survey:
+    name: ''
+    description: ''
+    spec:
+      - question_name: Server Name or Pattern
+        type: text
+        variable: HOSTS
+        required: false
+      - question_name: Choose Environment
+        type: multiplechoice
+        variable: env
+        choices:
+          - Dev
+          - QA
+          - Prod
+        required: true

-  - name: LINUX / Compliance Scan with Satellite
-    project: Ansible official demo project
-    playbook: satellite/server_openscap.yml
-    inventory: Workshop Inventory
-    execution_environment: Ansible Engine 2.9 execution environment
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    credentials:
-      - Satellite Credential
-      - Workshop Credential
-    extra_vars:
-      policy_scan: all
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Server Name or Pattern
-          type: text
-          variable: _hosts
-          required: false
+- name: LINUX / Compliance Scan with Satellite
+  project: Ansible official demo project
+  playbook: satellite/server_openscap.yml
+  inventory: Workshop Inventory
+  execution_environment: Ansible Engine 2.9 execution environment
+  notification_templates_started: Telemetry
+  notification_templates_success: Telemetry
+  notification_templates_error: Telemetry
+  credentials:
+    - Satellite Credential
+    - Workshop Credential
+  extra_vars:
+    policy_scan: all
+  survey_enabled: true
+  survey:
+    name: ''
+    description: ''
+    spec:
+      - question_name: Server Name or Pattern
+        type: text
+        variable: HOSTS
+        required: false

-  - name: SATELLITE / Publish Content View Version
-    project: Ansible official demo project
-    playbook: satellite/satellite_publish.yml
-    inventory: Workshop Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    credentials:
-      - Satellite Credential
-    extra_vars:
-      env: Dev
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Select Content View
-          variable: content_view
-          type: multiplechoice
-          choices: "{{ satellite_content_views | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
-          required: true
+- name: SATELLITE / Publish Content View Version
+  project: Ansible official demo project
+  playbook: satellite/satellite_publish.yml
+  inventory: Workshop Inventory
+  notification_templates_started: Telemetry
+  notification_templates_success: Telemetry
+  notification_templates_error: Telemetry
+  credentials:
+    - Satellite Credential
+  extra_vars:
+    env: Dev
+  survey_enabled: true
+  survey:
+    name: ''
+    description: ''
+    spec:
+      - question_name: Select Content View
+        variable: content_view
+        type: multiplechoice
+        choices: "{{ satellite_content_views | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
+        required: true

-  - name: SATELLITE / Promote Content View Version
-    project: Ansible official demo project
-    playbook: satellite/satellite_promote.yml
-    inventory: Workshop Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    credentials:
-      - Satellite Credential
-    survey_enabled: true
-    survey:
-      name: ''
-      description: ''
-      spec:
-        - question_name: Select Content View
-          variable: content_view
-          type: multiplechoice
-          choices: "{{ satellite_content_views | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
-          required: true
-        - question_name: Current Lifecycle Environment
-          variable: current_lifecycle_environment
-          type: multiplechoice
-          choices: "{{ satellite_lifecycle_environments | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
-          required: true
-        - question_name: Next Lifecycle Environment
-          variable: lifecycle_environment
-          type: multiplechoice
-          choices: "{{ satellite_lifecycle_environments | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
-          required: true
-
-  - name: SETUP / Satellite
-    project: Ansible official demo project
-    playbook: satellite/setup_satellite.yml
-    inventory: Workshop Inventory
-    notification_templates_started: Telemetry
-    notification_templates_success: Telemetry
-    notification_templates_error: Telemetry
-    credentials:
-      - Satellite Credential
+- name: SATELLITE / Promote Content View Version
+  project: Ansible official demo project
+  playbook: satellite/satellite_promote.yml
+  inventory: Workshop Inventory
+  notification_templates_started: Telemetry
+  notification_templates_success: Telemetry
+  notification_templates_error: Telemetry
+  credentials:
+    - Satellite Credential
+  survey_enabled: true
+  survey:
+    name: ''
+    description: ''
+    spec:
+      - question_name: Select Content View
+        variable: content_view
+        type: multiplechoice
+        choices: "{{ satellite_content_views | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
+        required: true
+      - question_name: Current Lifecycle Environment
+        variable: current_lifecycle_environment
+        type: multiplechoice
+        choices: "{{ satellite_lifecycle_environments | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
+        required: true
+      - question_name: Next Lifecycle Environment
+        variable: lifecycle_environment
+        type: multiplechoice
+        choices: "{{ satellite_lifecycle_environments | selectattr('name', 'match', '^RHEL.*$') | map(attribute='name') | list}}"
+        required: true

+- name: SETUP / Satellite
+  project: Ansible official demo project
+  playbook: satellite/setup_satellite.yml
+  inventory: Workshop Inventory
+  notification_templates_started: Telemetry
+  notification_templates_success: Telemetry
+  notification_templates_error: Telemetry
+  credentials:
+    - Satellite Credential

+    
 controller_launch_jobs:
  - name: SETUP
    wait: false
@@ -200,7 +201,68 @@ controller_launch_jobs:
      demo: linux

  - name: SETUP / Satellite
-    wait: false
+    wait: true
+
+controller_workflows:
+  - name: Patch Dev
+    description: A workflow to patch the dev environment
+    organization: Default
+    notification_templates_started: Telemetry
+    notification_templates_success: Telemetry
+    notification_templates_error: Telemetry
+    survey_enabled: true
+    survey:
+      name: ''
+      description: ''
+      spec:
+        - question_name: Email
+          type: text
+          variable: email
+          required: false
+    simplified_workflow_nodes:
+      - identifier: Update Inventory
+        unified_job_template: Satellite Inventory
+        success_nodes:
+          - Check for Updates
+      - identifier: Publish New Patches
+        unified_job_template: 'SATELLITE / Publish Content View Version'
+        extra_data:
+          content_view: RHEL8
+        success_nodes:
+          - Check for Updates
+      - identifier: Check for Updates
+        unified_job_template: 'LINUX / Patching'
+        job_type: check
+        extra_data:
+          HOSTS: env_RHEL8_Dev
+        all_parents_must_converge: true
+        success_nodes:
+          - Approve Patches
+        failure_nodes:
+          - Ticket - Update Check
+      - identifier: Ticket - Update Check
+        unified_job_template: 'SUBMIT FEEDBACK'
+        extra_data:
+          feedback: Failed to check for updates in RHEL8_Dev
+      - identifier: Approve Patches
+        approval_node:
+          name: Push patches to Dev?
+          description: Review the patch report before approving
+        success_nodes:
+          - Apply Patches
+      - identifier: Apply Patches
+        unified_job_template: 'LINUX / Patching'
+        job_type: run
+        extra_data:
+          HOSTS: env_RHEL8_Dev
+        failure_nodes:
+          - Ticket - Update Apply
+      - identifier: Ticket - Update Apply
+        unified_job_template: 'SUBMIT FEEDBACK'
+        extra_data:
+          feedback: Failed to apply updates to RHEL8_Dev
+
+

 #######################
 ### Satellite Vars ###