From 1704b440bbbde9be527507943682f5ca4a16c8a9 Mon Sep 17 00:00:00 2001 From: Scott Harwell <805434+scottharwell@users.noreply.github.com> Date: Fri, 3 Nov 2023 10:02:19 -0400 Subject: [PATCH] Update to account for dependent collection updates (#5) --- CHANGELOG.rst | 23 +++++++ changelogs/changelog.yaml | 67 +++++++++++-------- galaxy.yml | 2 +- .../configure_app.yml | 0 .../tasks/job_templates/content_lab_aws.yml | 14 ++-- .../tasks/job_templates/content_lab_azure.yml | 60 +++++------------ 6 files changed, 87 insertions(+), 79 deletions(-) rename playbook_configure_aap.yml => playbooks/configure_app.yml (100%) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5f1faba..b34f6ac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,9 +6,32 @@ Aoc.Controller_Demo_Config Release Notes This changelog describes changes after version 3.0.0. +v4.2.0 +====== + +Release Summary +--------------- + +Updates to dependent collections. + +Major Changes +------------- + +- Moved playbook to playbooks folder. + +Minor Changes +------------- + +- Updated for changes to dependent collections. + v4.1.1 ====== +Release Summary +--------------- + +Added azure tags to job templates. + Minor Changes ------------- diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 17480dc..176c5b7 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -3,61 +3,72 @@ releases: 4.0.0: changes: breaking_changes: - - All variable names have been edited and refactored. See ``roles/controller/defaults/main.yml`` - for new variables and structure. + - All variable names have been edited and refactored. See ``roles/controller/defaults/main.yml`` + for new variables and structure. major_changes: - - Flags to deploy validated content, content lab content, or both. - - Separated the ability to deploy validated content and content lab content. + - Flags to deploy validated content, content lab content, or both. + - Separated the ability to deploy validated content and content lab content. minor_changes: - - Introduced change log. - release_summary: Refactored the collection with the intent of having a general + - Introduced change log. + release_summary: + Refactored the collection with the intent of having a general use as a PoC for seeding content into automation controller. fragments: - - 1-seeded-content-refactor.yml - release_date: '2023-07-19' + - 1-seeded-content-refactor.yml + release_date: "2023-07-19" 4.0.1: changes: minor_changes: - - Removed requirements.yml + - Removed requirements.yml release_summary: Removed requirements.yml to push dependency to EE. fragments: - - remove-requirements.yml - release_date: '2023-07-19' + - remove-requirements.yml + release_date: "2023-07-19" 4.0.2: changes: minor_changes: - - Removed assertions prior to playbook run. - release_summary: Removed assertions prior to playbook run that were no longer + - Removed assertions prior to playbook run. + release_summary: + Removed assertions prior to playbook run that were no longer needed. - release_date: '2023-07-19' + release_date: "2023-07-19" 4.0.3: changes: minor_changes: - - Fixes to ensure that seeded content would deploy properly on AAP. - release_summary: Fixes to ensure that seeded content would deploy properly on + - Fixes to ensure that seeded content would deploy properly on AAP. + release_summary: + Fixes to ensure that seeded content would deploy properly on AAP. fragments: - - controller-fixes.yml - release_date: '2023-07-19' + - controller-fixes.yml + release_date: "2023-07-19" 4.1.0: changes: breaking_changes: - - Changed variables that start with ``azure_`` to ``azure.``. + - Changed variables that start with ``azure_`` to ``azure.``. major_changes: - - Added AWS job templates. - - Added GitHub Workflows tests. + - Added AWS job templates. + - Added GitHub Workflows tests. minor_changes: - - Readme updates to account for the new content added. + - Readme updates to account for the new content added. release_summary: Adding AWS content to the cloud content lab seeded content. fragments: - - 2-added-aws-content.yml - release_date: '2023-07-22' + - 2-added-aws-content.yml + release_date: "2023-07-22" 4.1.1: changes: minor_changes: - - Added azure tag to job templates. - - Bumped pre-commit tool versions. + - Added azure tag to job templates. + - Bumped pre-commit tool versions. release_summary: Added azure tags to job templates. fragments: - - 4-azure-tags.yml - release_date: '2023-08-08' + - 4-azure-tags.yml + release_date: "2023-08-08" + 4.2.0: + changes: + major_changes: + - Moved playbook to playbooks folder. + minor_changes: + - Updated for changes to dependent collections. + release_summary: Updates to dependent collections. + release_date: "2023-11-03" diff --git a/galaxy.yml b/galaxy.yml index 90a7170..a7a1c7a 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: aoc name: controller_demo_config -version: 4.1.1 +version: 4.2.0 authors: - Scott Harwell description: A collection of content for setting up Ansible on Cloud demos rapidly. diff --git a/playbook_configure_aap.yml b/playbooks/configure_app.yml similarity index 100% rename from playbook_configure_aap.yml rename to playbooks/configure_app.yml diff --git a/roles/controller/tasks/job_templates/content_lab_aws.yml b/roles/controller/tasks/job_templates/content_lab_aws.yml index f8d01cb..4089f19 100644 --- a/roles/controller/tasks/job_templates/content_lab_aws.yml +++ b/roles/controller/tasks/job_templates/content_lab_aws.yml @@ -3,7 +3,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.create_rhel_vm.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_vm.yml + playbook: playbooks/create_vm.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: create_vm_aws_region: "{{ aws.region }}" @@ -34,7 +34,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.delete_rhel_vm.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_vm.yml + playbook: playbooks/create_vm.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: aws_region: "{{ aws.region }}" @@ -57,7 +57,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.create_peer_network.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_peer_network.yml + playbook: playbooks/create_peer_network.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: aws_region: "{{ aws.region }}" @@ -83,7 +83,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.delete_peer_network.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_delete_peer_network.yml + playbook: playbooks/delete_peer_network.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: aws_region: "{{ aws.region }}" @@ -105,7 +105,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.create_reports.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_reports.yml + playbook: playbooks/create_reports.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: reports_aws_region: "{{ aws.region }}" @@ -127,7 +127,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.create_transit_network.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_transit_network.yml + playbook: playbooks/create_transit_network.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: aws_region: "{{ aws.region }}" @@ -159,7 +159,7 @@ ansible.controller.job_template: name: "{{ job_templates.aws.delete_transit_network.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_delete_transit_network.yml + playbook: playbooks/delete_transit_network.yml project: "{{ projects.aws_lab_roles.name }}" extra_vars: aws_region: "{{ aws.region }}" diff --git a/roles/controller/tasks/job_templates/content_lab_azure.yml b/roles/controller/tasks/job_templates/content_lab_azure.yml index 9c6e2f4..6e61da1 100644 --- a/roles/controller/tasks/job_templates/content_lab_azure.yml +++ b/roles/controller/tasks/job_templates/content_lab_azure.yml @@ -3,7 +3,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Create Resource Group inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_resource_group.yml + playbook: playbooks/create_resource_group.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -23,7 +23,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.vnet.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_vnet.yml + playbook: playbooks/create_vnet.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -48,7 +48,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.create_rhel_vm.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_vm.yml + playbook: playbooks/create_vm.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -84,7 +84,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.delete_rhel_vm.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_delete_vm.yml + playbook: playbooks/delete_vm.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -108,7 +108,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Create Windows Server VM inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_vm.yml + playbook: playbooks/create_vm.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -140,7 +140,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Delete Windows VM inventory: "{{ inventories.localhost.name }}" - playbook: playbook_delete_vm.yml + playbook: playbooks/delete_vm.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -164,7 +164,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Delete Resource Group inventory: "{{ inventories.localhost.name }}" - playbook: playbook_delete_resource_group.yml + playbook: playbooks/delete_resource_group.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -185,7 +185,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Create Network Peering Demo inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_transit_network.yml + playbook: playbooks/create_transit_network.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -211,7 +211,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Delete Network Peering Demo project: "{{ projects.azure_lab_roles.name }}" - playbook: playbook_delete_transit_network.yml + playbook: playbooks/delete_transit_network.yml inventory: "{{ inventories.localhost.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -234,7 +234,7 @@ name: "{{ job_templates.azure.dnf_update.name }}" job_type: run project: "{{ projects.azure_lab_roles.name }}" - playbook: playbook_update_rhel_vms.yml + playbook: playbooks/update_rhel_vms.yml inventory: "{{ inventories.azure.name }}" limit: rhel credentials: @@ -256,7 +256,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.install_arc_agent.name }}" inventory: "{{ inventories.azure.name }}" - playbook: playbook_install_arc_agent.yml + playbook: playbooks/install_arc_agent.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -288,7 +288,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Enable Arc Extensions inventory: "{{ inventories.azure.name }}" - playbook: playbook_enable_arc_extension.yml + playbook: playbooks/enable_arc_extension.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group: "{{ azure.resource_group }}" @@ -312,7 +312,7 @@ ansible.controller.job_template: name: Content Lab - Azure - Disable Arc Extensions inventory: "{{ inventories.azure.name }}" - playbook: playbook_disable_arc_extension.yml + playbook: playbooks/disable_arc_extension.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: resource_group_name: "{{ azure.resource_group }}" @@ -336,7 +336,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.replace_log_analytics_with_azure_monitor.name }}" inventory: "{{ inventories.azure.name }}" - playbook: playbook_replace_log_analytics_with_arc_linux.yml + playbook: playbooks/replace_log_analytics_with_arc_linux.yml project: "{{ projects.azure_lab_roles.name }}" extra_vars: region: "{{ azure.region }}" @@ -359,7 +359,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.create_log_analytics_ws.name }}" inventory: "{{ inventories.localhost.name }}" - playbook: playbook_create_log_analytics_workspace.yml + playbook: playbooks/create_log_analytics_workspace.yml project: "{{ projects.azure_lab_roles.name }}" credentials: - "{{ credentials.ssh.name }}" @@ -383,7 +383,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.install_log_analytics.name }}" inventory: "{{ inventories.azure.name }}" - playbook: playbook_install_log_analytics_agent.yml + playbook: playbooks/install_log_analytics_agent.yml project: "{{ projects.azure_lab_roles.name }}" credentials: - "{{ credentials.ssh.name }}" @@ -410,7 +410,7 @@ ansible.controller.job_template: name: "{{ job_templates.azure.uninstall_log_analytics.name }}" inventory: "{{ inventories.azure.name }}" - playbook: playbook_uninstall_log_analytics_agent.yml + playbook: playbooks/uninstall_log_analytics_agent.yml project: "{{ projects.azure_lab_roles.name }}" credentials: - "{{ credentials.ssh.name }}" @@ -427,29 +427,3 @@ tags: - templates - azure - -- name: Content Lab - Run Ephemeral Workload Test - ansible.controller.job_template: - name: Content Lab - Azure Demos - Ephemeral Workload Test - job_type: run - project: "{{ projects.azure_demo_project.name }}" - playbook: project/emphemeral_workload_test.yml - inventory: "{{ inventories.localhost.name }}" - credentials: - - "{{ credentials.azure_service_principal.name }}" - - "{{ credentials.controller.name }}" - - "{{ credentials.ssh.name }}" - become_enabled: true - job_slice_count: 1 - state: present - when: - - (seed_lab_content | bool) - - credentials.azure_service_principal.name is defined - - credentials.ssh.name is defined - - credentials.controller.name is defined - - projects.azure_demo_project.name is defined - - inventories.localhost.name is defined - register: ephemeral_workload_template - tags: - - templates - - azure