From 39d2d0f2831605b245ad6acda295bc9dc1450f10 Mon Sep 17 00:00:00 2001
From: Zach LeBlanc <zjleblanc3@gmail.com>
Date: Tue, 17 Dec 2024 14:11:06 -0600
Subject: [PATCH] Upgade pywinrm to fix Windows workloads for AAP 2.5 EE
 running Python 3.11 (#207)

---
 .gitignore                           | 2 ++
 common/setup.yml                     | 2 ++
 execution_environments/README.md     | 5 ++++-
 execution_environments/apd-ee-25.yml | 2 ++
 windows/group_vars/os_windows.yml    | 5 -----
 windows/setup.yml                    | 8 ++++----
 6 files changed, 14 insertions(+), 10 deletions(-)
 delete mode 100644 windows/group_vars/os_windows.yml

diff --git a/.gitignore b/.gitignore
index da93076ac..3b58bfe29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ choose_demo_example_aws.yml
 roles/*
 !roles/requirements.yml
 .deployment_id
+.cache/
+.ansible/
\ No newline at end of file
diff --git a/common/setup.yml b/common/setup.yml
index 31be3c43f..1854a12fc 100644
--- a/common/setup.yml
+++ b/common/setup.yml
@@ -71,6 +71,8 @@ controller_groups:
     variables:
       ansible_connection: winrm
       ansible_winrm_transport: credssp
+      ansible_winrm_server_cert_validation: ignore
+      ansible_port: 5986
 
 controller_templates:
   - name: SUBMIT FEEDBACK
diff --git a/execution_environments/README.md b/execution_environments/README.md
index a86a8e83b..a2a2b2ef1 100644
--- a/execution_environments/README.md
+++ b/execution_environments/README.md
@@ -7,8 +7,11 @@ Currently these execution environment images are created manually using the `bui
 ## Building the execution environment images
 
 1. `podman login registry.redhat.io` in order to pull the base EE images
-2. `./build.sh` to build the EE images and add them to your local podman image cache
+2. `export ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN="<token>"` obtained from [Automation Hub](https://console.redhat.com/ansible/automation-hub/token)
+3. `export ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN="<token>"` (same as above)
+4. `./build.sh` to build the EE images and add them to your local podman image cache
 
 The `build.sh` script creates multiple EE images, each based on the ee-minimal image that comes with a different minor version of AAP.  These images are created in the "quay.io/ansible-product-demos" namespace.  Currently the script builds the following images:
 
 * quay.io/ansible-product-demos/apd-ee-24
+* quay.io/ansible-product-demos/apd-ee-25
diff --git a/execution_environments/apd-ee-25.yml b/execution_environments/apd-ee-25.yml
index d0668bbf2..68a287910 100644
--- a/execution_environments/apd-ee-25.yml
+++ b/execution_environments/apd-ee-25.yml
@@ -6,6 +6,8 @@ images:
 
 dependencies:
   galaxy: requirements-25.yml
+  python:
+    - pywinrm>=0.4.3
   python_interpreter:
     python_path: /usr/bin/python3.11
 
diff --git a/windows/group_vars/os_windows.yml b/windows/group_vars/os_windows.yml
deleted file mode 100644
index a6468374e..000000000
--- a/windows/group_vars/os_windows.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-ansible_connection: winrm
-ansible_winrm_transport: ntlm
-ansible_winrm_server_cert_validation: ignore
-ansible_port: 5986
diff --git a/windows/setup.yml b/windows/setup.yml
index 66b2c7ad1..bcd3299d9 100644
--- a/windows/setup.yml
+++ b/windows/setup.yml
@@ -420,7 +420,7 @@ controller_workflows:
         unified_job_template: Cloud / AWS / Create VM
         job_type: run
         extra_data:
-          create_vm_vm_name: dc01.ansible.local
+          create_vm_vm_name: dc01
           create_vm_vm_purpose: domain_controller
           create_vm_vm_deployment: domain_ansible_local
           vm_blueprint: windows_full
@@ -430,7 +430,7 @@ controller_workflows:
         unified_job_template: Cloud / AWS / Create VM
         job_type: run
         extra_data:
-          create_vm_vm_name: winston.ansible.local
+          create_vm_vm_name: winston
           create_vm_vm_purpose: domain_computer
           create_vm_vm_deployment: domain_ansible_local
           vm_blueprint: windows_core
@@ -440,7 +440,7 @@ controller_workflows:
         unified_job_template: Cloud / AWS / Create VM
         job_type: run
         extra_data:
-          create_vm_vm_name: winthrop.ansible.local
+          create_vm_vm_name: winthrop
           create_vm_vm_purpose: domain_computer
           create_vm_vm_deployment: domain_ansible_local
           vm_blueprint: windows_core
@@ -474,7 +474,7 @@ controller_workflows:
         job_type: run
         extra_data:
           _hosts: purpose_domain_computer
-          domain_controller: dc01.ansible.local
+          domain_controller: dc01
         failure_nodes:
           - Cleanup Resources
         success_nodes: