Skip to content

Commit

Permalink
Upgade pywinrm to fix Windows workloads for AAP 2.5 EE running Python…
Browse files Browse the repository at this point in the history
… 3.11 (ansible#207)
  • Loading branch information
zjleblanc authored Dec 17, 2024
1 parent 3137ce1 commit 39d2d0f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ choose_demo_example_aws.yml
roles/*
!roles/requirements.yml
.deployment_id
.cache/
.ansible/
2 changes: 2 additions & 0 deletions common/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion execution_environments/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions execution_environments/apd-ee-25.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ images:

dependencies:
galaxy: requirements-25.yml
python:
- pywinrm>=0.4.3
python_interpreter:
python_path: /usr/bin/python3.11

Expand Down
5 changes: 0 additions & 5 deletions windows/group_vars/os_windows.yml

This file was deleted.

8 changes: 4 additions & 4 deletions windows/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 39d2d0f

Please sign in to comment.