Merge pull request #2195 from IPvSean/devel

Network Workshop provisioner updated to AAP 2.5

provisioner/group_vars/all/all.yml

@@ -64,9 +64,9 @@ ee_registry_name: "registry.redhat.io"
 
 # List of execution environments to download during controller installation:
 ee_images:
-   - "{{ ee_registry_name }}/ansible-automation-platform-23/ee-29-rhel8:latest"
-   - "{{ ee_registry_name }}/ansible-automation-platform-23/ee-supported-rhel8:latest"
-   - "{{ ee_registry_name }}/ansible-automation-platform-23/ee-minimal-rhel8:latest"
+   - "{{ ee_registry_name }}/ansible-automation-platform-25/ee-supported-rhel9:latest"
+   - "{{ ee_registry_name }}/ansible-automation-platform/ee-minimal-rhel9:latest"
 
 # Default EE that uses the registry credential (Default execution environment)
-ee_default_image: "{{ ee_registry_name }}/ansible-automation-platform-23/ee-supported-rhel8:latest"
+ee_default_image: "{{ ee_registry_name }}/ansible-automation-platform-25/ee-supported-rhel9:latest"
+code_server_port: 8123

provisioner/group_vars/all/vpc_rules.yml

@@ -70,6 +70,16 @@ workshops:
         from_port: 27199
         cidr_ip: 0.0.0.0/0
         rule_desc: receptor
+      - proto: tcp
+        to_port: 8123
+        from_port: 8123
+        cidr_ip: 0.0.0.0/0
+        rule_desc: receptor
+      - proto: tcp
+        to_port: 8501
+        from_port: 8501
+        cidr_ip: 0.0.0.0/0
+        rule_desc: receptor
   f5:
     ports:
       - proto: tcp

provisioner/packer/automation-controller9.pkr.hcl

@@ -1,3 +1,16 @@
+packer {
+  required_plugins {
+    ansible = {
+      version = ">= 1.1.1"
+      source  = "github.com/hashicorp/ansible"
+    }
+    amazon = {
+      source  = "github.com/hashicorp/amazon"
+      version = "~> 1"
+    }
+  }
+}
+
 variable "ansible_vars_file" {
     type    = string
     default = null
@@ -20,8 +33,9 @@ data "amazon-ami" "automation_controller" {
 }
 
 source "amazon-ebs" "automation_controller_source" {
-  ami_name             = "automation_controller {{timestamp}}"
-  instance_type        = "m4.xlarge"
+  ami_name             = "automation_controller {{ timestamp }}"
+  // instance_type        = "m4.xlarge"
+  instance_type        = "m5.2xlarge"
   region               = "us-east-1"
   associate_public_ip_address = "true"
   source_ami           = data.amazon-ami.automation_controller.id
@@ -32,14 +46,14 @@ source "amazon-ebs" "automation_controller_source" {
   ami_regions = ["us-east-1"]
   launch_block_device_mappings {
     device_name = "/dev/sda1"
-    volume_size = "40"
+    volume_size = "60"
     volume_type = "gp3"
     delete_on_termination = "true"
     iops = "3000"
     throughput = "125"
   }
   run_tags = {
-    "Name" = "packer-build"
+    "Name" = "packer - {{ timestamp }}"
     "owner" = "seanc"
   }
 }

provisioner/packer/pre_build_controller.yml

@@ -1,13 +1,13 @@
 ---
-- name: Initial check setup
-  hosts: localhost
-  connection: local
-  become: false
-  gather_facts: true
-  tasks:
-    - name: Download AAP
-      ansible.builtin.include_role:
-        name: ../../roles/aap_download
+# - name: Initial check setup
+#   hosts: localhost
+#   connection: local
+#   become: false
+#   gather_facts: true
+#   tasks:
+#     - name: Download AAP
+#       ansible.builtin.include_role:
+#         name: ../../roles/aap_download
 
 - name: Configures automation controller node
   hosts: all
@@ -20,33 +20,54 @@
     student: "{{ username }}"
     short_name: "ansible-1"
   tasks:
+    - name: List ansible.controller collection
+      delegate_to: localhost
+      become: false
+      ansible.builtin.shell:
+        cmd: "ansible-galaxy collection list | grep ansible.controller"
+      register: collections_list
+
+    - name: Display the collection version information
+      ansible.builtin.debug:
+        msg: "{{ collections_list.stdout }}"
+
     - name: Set hostname
       ansible.builtin.hostname:
-        name: "{{ short_name|default('ansible-1') }}"
+        name: "{{ short_name | default('ansible-1') }}"
+
     - name: Setup /etc/hosts file per student
       ansible.builtin.template:
         src: "{{ playbook_dir }}/templates/etchosts.j2"
         dest: "/etc/hosts"
+
     - name: Print out ansible_host var
       ansible.builtin.include_vars:
-        file: "../group_vars/all/all.yml" 
+        file: "../group_vars/all/all.yml"
+
     - name: Print out ansible_host var
       ansible.builtin.debug:
         var: hostvars.controller
+
     - name: Print ipv4 address
       ansible.builtin.debug:
         var: ansible_default_ipv4.address
+
     - name: Include user accounts
       ansible.builtin.include_role:
         name: ../../roles/user_accounts
+
     - name: Include common role
       ansible.builtin.include_role:
         name: ../../roles/common
+
     - name: Establish connetivity to managed nodes
       ansible.builtin.include_role:
         name: ../../roles/connectivity_test
+
     - name: Configure control node
       ansible.builtin.include_role:
         name: ../../roles/control_node
-    - include_role:
+
+    - name: Install code-server
+      ansible.builtin.include_role:
         name: ../../roles/code_server_native

provisioner/packer/templates/etchosts.j2

@@ -1,5 +1,4 @@
 127.0.0.1   localhost localhost.localdomain localhost4 localhost4.localdomain4
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 
-127.0.0.1 {{ short_name }}
-
+127.0.0.1 {{ short_name }} {{ short_name }}.local

provisioner/provision_lab.yml

@@ -45,7 +45,8 @@
   gather_facts: false
 
   tasks:
-    - ansible.builtin.include_role:
+    - name: Check connectivity to all AWS instances
+      ansible.builtin.include_role:
         name: ../roles/connectivity_test
 
 - name: Configure host names on managed nodes