Merge branch 'main' into netbox-aap25-241030

aws_ee/ansible.cfg

@@ -0,0 +1,9 @@
+[galaxy]
+server_list = automation_hub, release_galaxy
+
+[galaxy_server.automation_hub]
+url=https://console.redhat.com/api/automation-hub/content/published/
+auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
+
+[galaxy_server.release_galaxy]
+url=https://galaxy.ansible.com/

aws_ee/bindep.txt

@@ -1,2 +1,6 @@
 unzip
 dnf
+systemd-devel [compile platform:rhel-8]
+python3.11-devel [compile platform:rhel-8]
+pkgconf-pkg-config [compile platform:rhel-8]
+gcc [compile platform:rhel-8]

aws_ee/execution-environment.yml

@@ -1,18 +1,31 @@
 ---
-version: 1
-
-build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8'
+version: 3
+images:
+  base_image:
+    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
 
 dependencies:
   galaxy: requirements.yml
   python: requirements.txt
   system: bindep.txt
 
+additional_build_files:
+    # Can be used to resolve collections from private automation hub
+    - src: ansible.cfg
+      dest: configs
+
+options:
+    package_manager_path: /usr/bin/microdnf
+
 additional_build_steps:
-  append:
-    - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
-    - RUN unzip /awscliv2.zip -d /aws
-    - RUN /aws/aws/install
-    - RUN curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/linux_64bit/session-manager-plugin.rpm" -o "/session-manager-plugin.rpm"
-    - RUN dnf install -y /session-manager-plugin.rpm
+    prepend_base:
+        - RUN $PYCMD -m pip install --upgrade pip setuptools 
+    prepend_galaxy:
+        # Add custom ansible.cfg which defines collection install sources
+        - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
+        # AH_TOKEN is passed into the build command using a --build-arg
+        # accept this as an ARG during this stage to reference later
+        - ARG AH_TOKEN
+        # Use the above ARG to define an environment variable holding
+        # the token for resolving private collections
+        - ENV ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN=$AH_TOKEN

aws_ee/requirements.txt

@@ -1,3 +1,10 @@
 pysnow
 requests
 netaddr
+#
+# When updating the minimal requirements please also update
+# - tests/unit/constraints.txt
+# - tests/integration/constraints.txt
+# - tests/integration/targets/setup_botocore_pip
+botocore>=1.31.0
+boto3>=1.28.0

aws_ee/requirements.yml

@@ -2,8 +2,10 @@
 collections:
   - name: servicenow.itsm
   - name: amazon.aws
+  - name: ansible.controller
+  - name: ansible.platform
+  - name: ansible.posix
   - name: awx.awx
   - name: amazon.cloud
   - name: community.aws
   - name: cloud.terraform
-    version: 1.0.0

network-netbox-eda-ee/execution-environment.yml

@@ -3,7 +3,6 @@ version: 3
 images:
   base_image:
     name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
-
 dependencies:
     galaxy: ansible-collections.yml
     python: python-packages.txt

workshop_ee/execution-environment.yml

@@ -2,7 +2,7 @@
 version: 3
 images:
   base_image:
-    name: 'registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel8:latest'
+    name: 'registry.redhat.io/ansible-automation-platform-24/ee-supported-rhel8:latest'
 
 additional_build_files:
     # Can be used to resolve collections from private automation hub

workshop_ee/requirements.txt

@@ -1 +1,2 @@
 petname==2.6
+netaddr