From 8b03834525b26342490b9364b6d47aa78ad78ed2 Mon Sep 17 00:00:00 2001 From: Zachary LeBlanc Date: Fri, 13 Dec 2024 11:54:32 -0600 Subject: [PATCH] update apd-ee-25 pywinrm and consolidate os_windows group_vars; updated docs --- .gitignore | 2 ++ common/setup.yml | 2 ++ execution_environments/README.md | 9 +++++++-- execution_environments/apd-ee-25.yml | 2 ++ windows/group_vars/os_windows.yml | 5 ----- 5 files changed, 13 insertions(+), 7 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..a8522c9ed 100644 --- a/execution_environments/README.md +++ b/execution_environments/README.md @@ -6,9 +6,14 @@ 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 +1. Download the [openshift-clients rpm](https://access.redhat.com/downloads/content/rhel---9/x86_64/20821/openshift-clients/4.16.0-202408021139.p0.ge8fb3c0.assembly.stream.el9/x86_64/fd431d51/package) +2. Overwrite existing link to git-lfs by copying downloaded RPM to `/execution-environments/openshift-clients-4.16.0-202408021139.p0.ge8fb3c0.assembly.stream.el9.x86_64.rpm` +3. `podman login registry.redhat.io` in order to pull the base EE images +4. `export ANSIBLE_GALAXY_SERVER_CERTIFIED_TOKEN=""` obtained from [Automation Hub](https://console.redhat.com/ansible/automation-hub/token) +5. `export ANSIBLE_GALAXY_SERVER_VALIDATED_TOKEN=""` (same as above) +6. `./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