Minor changes

2022-02-15 14:57:59 -05:00
parent 3fb974987c
commit 825359ae53
8 changed files with 7 additions and 137 deletions
--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,2 @@
+openssl
+bind-utils
--- a/context/Containerfile
+++ b/context/Containerfile
@@ -1,31 +0,0 @@
-ARG EE_BASE_IMAGE=registry.redhat.io/ansible-automation-platform-20-early-access/ee-supported-rhel8:latest
-ARG EE_BUILDER_IMAGE=quay.io/ansible/ansible-builder:latest
-
-FROM $EE_BASE_IMAGE as galaxy
-ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=
-USER root
-
-ADD _build/ansible.cfg ~/.ansible.cfg
-
-ADD _build /build
-WORKDIR /build
-
-RUN ansible-galaxy role install -r requirements.yml --roles-path /usr/share/ansible/roles
-RUN ansible-galaxy collection install $ANSIBLE_GALAXY_CLI_COLLECTION_OPTS -r requirements.yml --collections-path /usr/share/ansible/collections
-
-FROM $EE_BUILDER_IMAGE as builder
-
-COPY --from=galaxy /usr/share/ansible /usr/share/ansible
-
-ADD _build/requirements.txt requirements.txt
-ADD _build/bindep.txt bindep.txt
-RUN ansible-builder introspect --sanitize --user-pip=requirements.txt --user-bindep=bindep.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt
-RUN assemble
-
-FROM $EE_BASE_IMAGE
-USER root
-
-COPY --from=galaxy /usr/share/ansible /usr/share/ansible
-
-COPY --from=builder /output/ /output/
-RUN /output/install-from-bindep && rm -rf /output/wheels
--- a/context/_build/ansible.cfg
+++ b/context/_build/ansible.cfg
@@ -1,48 +0,0 @@
-[defaults]
-# Use the YAML callback plugin.
-stdout_callback = community.general.yaml
-callback_enabled = community.general.yaml
-# Profile
-#stdout_callback = profile_tasks
-# Turn on pipelining for speed
-pipelining = True
-# Increase polling speed, to check completed tasks 
-poll_interval = 5
-# Increase forks for more better parallelism. :)
-forks          = 50
-# This can get annoying for non-production environments, so disable it.
-host_key_checking = False
-# These are annoying during playbook authoring / testing.
-retry_files_enabled = False
-callback_whitelist = timer,profile_tasks
-nocows = 1
-deprecation_warnings=False
-#display_skipped_hosts=False
-# Installs collections into [current dir]/ansible_collections/namespace/collection_name
-#collections_paths = ./
-force_valid_group_names = always
-interpreter_python = auto
-# Installs roles into [current dir]/roles/namespace.rolename
-#roles_path = ./roles
-inventory=/home/ptoal/.ansible/inventories/toallab/inventory
-inventory_plugins = host_list, script, yaml, ini, auto
-#vault_identity_list = toallab@/home/ptoal/.toallab.vault
-
-[ssh_connection]
-scp_if_ssh = True
-ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o PreferredAuthentications=publickey,password
-control_path = %(directory)s/ansible-ssh-%%h-%%p-%%r
-
-[persistent_connection]
-connect_timeout = 60
-ssh_type = libssh
-
-[galaxy]
-server_list = automation_hub, public
-
-[galaxy_server.automation_hub]
-url=https://cloud.redhat.com/api/automation-hub/
-auth_url=https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-token="eyJhbGciOiJIUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJhZDUyMjdhMy1iY2ZkLTRjZjAtYTdiNi0zOTk4MzVhMDg1NjYifQ.eyJpYXQiOjE2MjY3NDkxNzUsImp0aSI6ImRlYjhjOWIxLWI5MzQtNDU1OC1hOTVlLWM4NTQwZGQ1ZjhiYiIsImlzcyI6Imh0dHBzOi8vc3NvLnJlZGhhdC5jb20vYXV0aC9yZWFsbXMvcmVkaGF0LWV4dGVybmFsIiwiYXVkIjoiaHR0cHM6Ly9zc28ucmVkaGF0LmNvbS9hdXRoL3JlYWxtcy9yZWRoYXQtZXh0ZXJuYWwiLCJzdWIiOiJmOjUyOGQ3NmZmLWY3MDgtNDNlZC04Y2Q1LWZlMTZmNGZlMGNlNjpwdG9hbCIsInR5cCI6Ik9mZmxpbmUiLCJhenAiOiJjbG91ZC1zZXJ2aWNlcyIsIm5vbmNlIjoiYTI2NDVlNzYtNjAwMy00NmQ4LThiMjEtNWNmODI2NDc2NzVmIiwic2Vzc2lvbl9zdGF0ZSI6IjU2MGFhYjI1LTYyNDItNGM5Mi1iNDUzLWZmMGNhMzU0ZGVjMyIsInNjb3BlIjoib3BlbmlkIG9mZmxpbmVfYWNjZXNzIn0.X_1cui-ZSK5FnLgCL881OvNHHol4oqFiY2Yo1-9QbEc"
-[galaxy_server.public]
-url=https://galaxy.ansible.com/
--- a/context/_build/bindep_combined.txt
+++ b/context/_build/bindep_combined.txt
@@ -1,10 +0,0 @@
-openssl-devel [platform:rpm compile]  # from collection ovirt.ovirt, redhat.rhv
-gcc [platform:rpm compile]  # from collection ovirt.ovirt, redhat.rhv
-libcurl-devel [platform:rpm compile]  # from collection ovirt.ovirt, redhat.rhv
-libxml2-devel [platform:rpm compile]  # from collection ovirt.ovirt, redhat.rhv
-python3-pycurl [platform:rpm]  # from collection ovirt.ovirt, redhat.rhv
-python3-netaddr [platform:rpm]  # from collection ovirt.ovirt, redhat.rhv
-python3-jmespath [platform:rpm]  # from collection ovirt.ovirt, redhat.rhv
-python3-passlib [platform:rpm epel]  # from collection ovirt.ovirt, redhat.rhv
-qemu-img [platform:rpm]  # from collection ovirt.ovirt, redhat.rhv
-python38-devel  # from collection user
--- a/context/_build/requirements.yml
+++ b/context/_build/requirements.yml
@@ -1,38 +0,0 @@
---
-collections:
-  - name: davidban77.gns3
-    source: https://galaxy.ansible.com
-
-  - name: netbox.netbox
-    source: https://galaxy.ansible.com
-
-  - name: freeipa.ansible_freeipa
-    source: https://galaxy.ansible.com
-    #    source: https://hub.mgmt.toal.ca/api/galaxy/content/published/
-
-  - name: ovirt.ovirt
-    source: https://galaxy.ansible.com
-
-  - name: redhat.rhv
-    source: https://cloud.redhat.com/api/automation-hub/
-
-  - name: redhat.satellite
-    source: https://cloud.redhat.com/api/automation-hub/
-
-  - name: community.general
-    source: https://galaxy.ansible.com
-
-  - name: jjaswanson4.install_satellite    
-    source: https://galaxy.ansible.com
-
-  - name: jjaswanson4.configure_satellite    
-    source: https://galaxy.ansible.com
-
-  - name: redhat.satellite
-    source: https://cloud.redhat.com/api/automation-hub/
-
-  - name: community.crypto
-    source: https://galaxy.ansible.com
-
-##  - name: onepassword.connect
-#  - name: ansible.posix
--- a/context/_build/requirements_combined.txt
+++ b/context/_build/requirements_combined.txt
@@ -1,7 +0,0 @@
-gns3fy>=0.5.2  # from collection davidban77.gns3
-ovirt-engine-sdk-python>=4.4.10,>=4.4.10  # from collection ovirt.ovirt,redhat.rhv
-requests>=2.4.2  # from collection redhat.satellite
-ipaddress  # from collection redhat.satellite
-pynetbox  # from collection user
-boto3  # from collection user
-packaging  # from collection user
--- a/execution-environment.yml
+++ b/execution-environment.yml
@@ -2,10 +2,11 @@
 version: 1

 build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-20-early-access/ee-supported-rhel8:latest'
+  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-21/ee-supported-rhel8:latest'

 ansible_config: '../../../.ansible.cfg'

 dependencies:
  galaxy: collections/requirements.yml
  python: requirements.txt
+  system: bindep.txt
--- a/rhv_setup.yml
+++ b/rhv_setup.yml
@@ -216,6 +216,7 @@
  hosts: localhost
  connection: local
  tasks:
-  - name: Reminder
-    debug: "Don't forget to add tso off gro off gso off lro off to i217-LM NIC's (eg: Dell Optiplex)!"
+    - name: Reminder
+      debug:
+        msg: "Don't forget to add tso off gro off gso off lro off to i217-LM NIC's (eg: Dell Optiplex)!"
 # https://access.redhat.com/documentation/en-us/red_hat_virtualization/4.4/html/administration_guide/sect-hosts_and_networking#Editing_Host_Network_Interfaces_and_Assigning_Logical_Networks_to_Hosts