sync changes

ansible · Nov 8, 2023 · d183bb9 · d183bb9
1 parent 8179386
commit d183bb9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,3 +56,4 @@ provisioner/packer/manifest.zip
 *-artifact-*.json
 provisioner/test.yml
 provisioner/colin.yml
+.vscode/settings.json
diff --git a/provisioner/group_vars/all/all.yml b/provisioner/group_vars/all/all.yml
@@ -22,14 +22,11 @@ valid_workshop_types:
   - network
   - f5
   - rhel
-  - devops
   - security
   - windows
   - rhel_90
   - demo
-  - smart_mgmt
   - auto_satellite
-  - middleware
   - configascode
   - ripu
 network_type: multivendor

diff --git a/roles/populate_controller/defaults/main.yml b/roles/populate_controller/defaults/main.yml
@@ -12,3 +12,9 @@ auto_satellite_ee: "quay.io/s4v0/ee-automated-satellite-aap2:latest"
 configascode_ee: "registry.redhat.io/ansible-automation-platform-21/ee-minimal-rhel8:latest"
 ripu_ee: "registry.redhat.io/ansible-automation-platform-23/ee-supported-rhel8:1.0.0-208"
 run_commands_user: "ec2-user"
+controller_validate_certs: false
+controller_hostname: "https://{{ ansible_host }}"
+controller_username: "admin"
+controller_password: "{{ admin_password }}"
+controller_request_timeout: 200
+controller_configuration_projects_async_retries: 35
diff --git a/roles/populate_controller/tasks/network.yml b/roles/populate_controller/tasks/network.yml
@@ -1,11 +1,6 @@
 ---
 - name: use COP controller_configuration collection
   when: controller_projects is defined
-  vars:
-    controller_validate_certs: false
-    controller_hostname: "https://{{ ansible_host }}"
-    controller_username: "admin"
-    controller_password: "{{ admin_password }}"
   include_role:
     name: '{{ setup_controller }}'
   loop: