Updated to version 1.7.0

ansible-content-lab · Nov 3, 2023 · fa0d2c6 · fa0d2c6
1 parent e8b0f11
commit fa0d2c6
Show file tree

Hide file tree

Showing 23 changed files with 79 additions and 29 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,25 @@ Azure.Infrastructure_Config_Demos Release Notes
 
 This changelog describes changes after version 1.4.2.
 
+v1.7.0
+======
+
+Release Summary
+---------------
+
+Moved playbooks into playbooks folder and updated dependency versions.
+
+Major Changes
+-------------
+
+- Moved playbooks into playbooks folder so that playbooks may be called from `namespace.collection.playbook` syntax.
+- Updated dependency versions.
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- Playbook paths have changed.
+
 v1.6.0
 ======
 

diff --git a/README.md b/README.md
@@ -30,22 +30,22 @@ Click on the role name to be directed to the README specifically for that role.
 
 | Name                                                | Role(s) Used                                                                              | Description                                                                                                                                    |
 | --------------------------------------------------- | ----------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| `playbook_create_transit_network.yml`               | `roles.transit_peered_networks`                                                           | A playbook to create a multi-VPC hub-and-spoke network configuration using a transit gateway with DMZ and private networks.                    |
-| `playbook_delete_transit_network.yml`               | `roles.transit_peered_networks`                                                           | Deletes AWS resources created in the `playbook_create_transit_network` playbook.                                                               |
-| `playbook_create_resource_group.yml`                | N/A                                                                                       | Simple playbook demonstrating how to create an Azure resource group from extra vars.                                                           |
-| `playbook_create_vm.yml`                            | `roles.vms`                                                                               | A playbook that allows for VM creation using blueprints of defined variables.                                                                  |
-| `playbook_delete_vm.yml`                            | `roles.vms`                                                                               | Deletes  virtual machines and connected resources                                                                                              |
-| `playbook_delete_resource_group.yml`                | N/A                                                                                       | Deletes a resource group and all resources within it.                                                                                          |
-| `playbook_update_rhel_vms.yml`                      | N/A                                                                                       | Runs `dnf upgrade -y` on RHEL VMs.                                                                                                             |
-| `playbook_create_log_analytics_workspace.yml`       | `role.log_analytics`                                                                      | Creates a Log Analytics workspace for storing log data with logging extensions.                                                                |
-| `playbook_install_log_analytics_agent.yml`          | `roles.log_analytics`                                                                     | Deploys a Log Analytics workspace into your Azure subscription and then installs and configures Linux hosts to communicate with the workspace. |
-| `playbook_uninstall_log_analytics_agent.yml`        | `roles.log_analytics`                                                                     | Uninstalls the Log Analytics agent on Linux hosts and then deletes the Log Analytics workspace from your Azure subscription.                   |
-| `playbook_install_arc_agent.yml`                    | `roles.arc`                                                                               | Installs the Azure Arc agent on inventory hosts.                                                                                               |
-| `playbook_replace_log_analytics_with_arc_linux.yml` | `roles.arc`                                                                               | Installs the Arc agent, deploys the Azure Monitoring extension, and removes the log analytics extension or agent on Linux hosts.               |
-| `playbook_enable_arc_azure_monitor.yml`             | `roles.arc`                                                                               | Enables the Azure Monitor extension on servers that have the Azure Arc agent installed.                                                        |
-| `playbook_enable_arc_extension.yml`                 | `roles.arc`                                                                               | Enables an Azure Arc extension.                                                                                                                |
-| `playbook_disable_arc_extension.yml`                | `roles.arc`                                                                               | Disables an Azure Arc extension.                                                                                                               |
-| `playbook_proxmox_vm_migration.yml`                 | 1. `roles.vm_to_azure_prep`<br>2. `roles.proxmox_vm_convertion`<br>3. `roles.vm_to_azure` | Prepares a local Proxmox virtual machine to run in Azure, uploads the disk image, and creates an Azure virtual machine.                        |
+| `create_transit_network.yml`               | `roles.transit_peered_networks`                                                           | A playbook to create a multi-VPC hub-and-spoke network configuration using a transit gateway with DMZ and private networks.                    |
+| `delete_transit_network.yml`               | `roles.transit_peered_networks`                                                           | Deletes AWS resources created in the `create_transit_network` playbook.                                                               |
+| `create_resource_group.yml`                | N/A                                                                                       | Simple playbook demonstrating how to create an Azure resource group from extra vars.                                                           |
+| `create_vm.yml`                            | `roles.vms`                                                                               | A playbook that allows for VM creation using blueprints of defined variables.                                                                  |
+| `delete_vm.yml`                            | `roles.vms`                                                                               | Deletes  virtual machines and connected resources                                                                                              |
+| `delete_resource_group.yml`                | N/A                                                                                       | Deletes a resource group and all resources within it.                                                                                          |
+| `update_rhel_vms.yml`                      | N/A                                                                                       | Runs `dnf upgrade -y` on RHEL VMs.                                                                                                             |
+| `create_log_analytics_workspace.yml`       | `role.log_analytics`                                                                      | Creates a Log Analytics workspace for storing log data with logging extensions.                                                                |
+| `install_log_analytics_agent.yml`          | `roles.log_analytics`                                                                     | Deploys a Log Analytics workspace into your Azure subscription and then installs and configures Linux hosts to communicate with the workspace. |
+| `uninstall_log_analytics_agent.yml`        | `roles.log_analytics`                                                                     | Uninstalls the Log Analytics agent on Linux hosts and then deletes the Log Analytics workspace from your Azure subscription.                   |
+| `install_arc_agent.yml`                    | `roles.arc`                                                                               | Installs the Azure Arc agent on inventory hosts.                                                                                               |
+| `replace_log_analytics_with_arc_linux.yml` | `roles.arc`                                                                               | Installs the Arc agent, deploys the Azure Monitoring extension, and removes the log analytics extension or agent on Linux hosts.               |
+| `enable_arc_azure_monitor.yml`             | `roles.arc`                                                                               | Enables the Azure Monitor extension on servers that have the Azure Arc agent installed.                                                        |
+| `enable_arc_extension.yml`                 | `roles.arc`                                                                               | Enables an Azure Arc extension.                                                                                                                |
+| `disable_arc_extension.yml`                | `roles.arc`                                                                               | Disables an Azure Arc extension.                                                                                                               |
+| `proxmox_vm_migration.yml`                 | 1. `roles.vm_to_azure_prep`<br>2. `roles.proxmox_vm_convertion`<br>3. `roles.vm_to_azure` | Prepares a local Proxmox virtual machine to run in Azure, uploads the disk image, and creates an Azure virtual machine.                        |
 <!--end collection content-->
 
 #### Create Network Playbooks
@@ -126,7 +126,7 @@ rhel.vm.hostname ansible_user="ansible" ansible_ssh_private_key_file="/home/runn
 ##### Running the Playbook
 
 ```bash
-ansible-navigator run playbook_proxmox_vm_migration.yml \
+ansible-navigator run azure.infrastructure_config_demos.proxmox_vm_migration \
 -i inventory/hosts \
 --pae false \
 --mode stdout \
@@ -136,7 +136,7 @@ ansible-navigator run playbook_proxmox_vm_migration.yml \
 --eev $HOME/.ssh:/home/runner/.ssh \
 --eev $HOME/.azure:/runner/.azure \
 --eev /tmp:/tmp \
---extra-vars "@env/playbook_proxmox_vm_migration_extra_vars.yml" \
+--extra-vars "@env/proxmox_vm_migration_extra_vars.yml" \
 --extra-vars "proxmox_api_host=$PROXMOX_API_HOSTNAME" \
 --extra-vars "proxmox_api_user=$PROXMOX_USER" \
 --extra-vars "proxmox_api_token=$PROXMOX_API_TOKEN" \

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -0,0 +1,19 @@
+objects:
+  role: {}
+plugins:
+  become: {}
+  cache: {}
+  callback: {}
+  cliconf: {}
+  connection: {}
+  filter: {}
+  httpapi: {}
+  inventory: {}
+  lookup: {}
+  module: {}
+  netconf: {}
+  shell: {}
+  strategy: {}
+  test: {}
+  vars: {}
+version: 1.7.0
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -1,20 +1,32 @@
----
 ancestor: 1.4.2
 releases:
   1.5.0:
-    release_date: "2023-07-13"
     changes:
-      release_summary: Added the release changelog.
       minor_changes:
         - Required Ansible Lint rule for change logs.
+      release_summary: Added the release changelog.
+    release_date: "2023-07-13"
   1.6.0:
-    release_date: "2023-07-18"
     changes:
-      release_summary: Added VM blueprints and simple VNET role.
-      major_changes:
-        - Added a VNET role to provide an example of simple VNET creation.
       breaking_changes:
-        - Removed OS-specific playbook and role tasks and created a generic VM creation model based on VM blueprints.
         - Added and removed playbooks to account for role changes.
+        - Removed OS-specific playbook and role tasks and created a generic VM creation
+          model based on VM blueprints.
+      major_changes:
+        - Added a VNET role to provide an example of simple VNET creation.
       minor_changes:
         - Readme updates
+      release_summary: Added VM blueprints and simple VNET role.
+    release_date: "2023-07-18"
+  1.7.0:
+    changes:
+      breaking_changes:
+        - Playbook paths have changed.
+      major_changes:
+        - Moved playbooks into playbooks folder so that playbooks may be called from
+          `namespace.collection.playbook` syntax.
+        - Updated dependency versions.
+      release_summary:
+        Moved playbooks into playbooks folder and updated dependency
+        versions.
+    release_date: "2023-07-18"
diff --git a/galaxy.yml b/galaxy.yml
@@ -1,7 +1,7 @@
 ---
 namespace: azure
 name: infrastructure_config_demos
-version: 1.6.0
+version: 1.7.0
 readme: README.md
 authors:
   - Scott Harwell <[email protected]>

diff --git a/playbook_create_log_analytics_workspace.yml → playbooks/create_log_analytics_workspace.yml b/playbook_create_log_analytics_workspace.yml → playbooks/create_log_analytics_workspace.yml
diff --git a/playbook_create_resource_group.yml → playbooks/create_resource_group.yml b/playbook_create_resource_group.yml → playbooks/create_resource_group.yml
diff --git a/playbook_create_transit_network.yml → playbooks/create_transit_network.yml b/playbook_create_transit_network.yml → playbooks/create_transit_network.yml
diff --git a/playbook_create_vm.yml → playbooks/create_vm.yml b/playbook_create_vm.yml → playbooks/create_vm.yml
diff --git a/playbook_create_vnet.yml → playbooks/create_vnet.yml b/playbook_create_vnet.yml → playbooks/create_vnet.yml
diff --git a/playbook_delete_resource_group.yml → playbooks/delete_resource_group.yml b/playbook_delete_resource_group.yml → playbooks/delete_resource_group.yml
diff --git a/playbook_delete_transit_network.yml → playbooks/delete_transit_network.yml b/playbook_delete_transit_network.yml → playbooks/delete_transit_network.yml
diff --git a/playbook_delete_vm.yml → playbooks/delete_vm.yml b/playbook_delete_vm.yml → playbooks/delete_vm.yml
diff --git a/playbook_delete_vnet.yml → playbooks/delete_vnet.yml b/playbook_delete_vnet.yml → playbooks/delete_vnet.yml
diff --git a/playbook_disable_arc_extension.yml → playbooks/disable_arc_extension.yml b/playbook_disable_arc_extension.yml → playbooks/disable_arc_extension.yml
diff --git a/playbook_enable_arc_extension.yml → playbooks/enable_arc_extension.yml b/playbook_enable_arc_extension.yml → playbooks/enable_arc_extension.yml
diff --git a/playbook_install_arc_agent.yml → playbooks/install_arc_agent.yml b/playbook_install_arc_agent.yml → playbooks/install_arc_agent.yml
diff --git a/playbook_install_log_analytics_agent.yml → playbooks/install_log_analytics_agent.yml b/playbook_install_log_analytics_agent.yml → playbooks/install_log_analytics_agent.yml
diff --git a/playbook_proxmox_vm_migration.yml → playbooks/proxmox_vm_migration.yml b/playbook_proxmox_vm_migration.yml → playbooks/proxmox_vm_migration.yml
diff --git a/..._replace_log_analytics_with_arc_linux.yml → .../replace_log_analytics_with_arc_linux.yml b/..._replace_log_analytics_with_arc_linux.yml → .../replace_log_analytics_with_arc_linux.yml
diff --git a/playbook_uninstall_log_analytics_agent.yml → playbooks/uninstall_log_analytics_agent.yml b/playbook_uninstall_log_analytics_agent.yml → playbooks/uninstall_log_analytics_agent.yml
diff --git a/playbook_update_rhel_vms.yml → playbooks/update_rhel_vms.yml b/playbook_update_rhel_vms.yml → playbooks/update_rhel_vms.yml
diff --git a/requirements.yml b/requirements.yml
@@ -1,8 +1,8 @@
 ---
 collections:
   - name: azure.azcollection
-    version: 1.16.0
+    version: 1.18.1
   - name: ansible.windows
     version: 2.0.0
   - name: community.general
-    version: 7.1.0
+    version: 8.0.0