Clean HEAD

Author: sean-m-sullivan

.gitignore

@@ -7,3 +7,4 @@ test
 tests/output
 .vscode
 ansible.cfg
+tests/localtest.yml

roles/eda_rulebook_activations/README.md

@@ -60,7 +60,7 @@ This also speeds up the overall role.
 |`awx_token`|""|no|str|The token used to authenticate to controller.|
 |`enabled`|"true"|no|str|Whether the rulebook activation is automatically enabled to run.|
 |`state`|`present`|no|str|Desired state of the rulebook activation.|
-|`organization_name`|""|no|str|The name of the organization.|
+|`organization`|""|no|str|The name of the organization.|
 |`eda_credentials`|""|no|list|A list of IDs for EDA credentials used by the rulebook activation.|
 |`k8s_service_name`|""|no|str|The name of the Kubernetes service associated with this rulebook activation.|
 |`swap_single_source`|"true"|no|bool|Allow swapping of single sources in a rulebook without name match.|

roles/gateway_http_ports/tasks/main.yml

@@ -39,7 +39,7 @@
   loop: "{{ __gateway_http_ports_job_async.results }}"
   loop_control:
     loop_var: __gateway_http_ports_job_async_results_item
-    label: "{{ __operation.verb }} AAP Platform Http Ports {{ __gateway_http_ports_job_async_result.__gateway_http_ports_item.name }} | Wait for finish the Http Ports {{ __operation.action }}"
+    label: "{{ __operation.verb }} AAP Platform Http Ports {{ __gateway_http_ports_job_async_results_item.__gateway_http_ports_item.name }} | Wait for finish the Http Ports {{ __operation.action }}"
   when: __gateway_http_ports_job_async_results_item.ansible_job_id is defined
   no_log: "{{ gateway_http_ports_secure_logging }}"
   vars:

roles/gateway_routes/tasks/main.yml

@@ -25,7 +25,7 @@
   loop_control:
     loop_var: __gateway_routes_item
     label: "{{ __operation.verb }} the Gateway route {{ __gateway_routes_item.name }}"
-    pause: "{{ controller_configuration_labels_loop_delay }}"
+    pause: "{{ gateway_routes_loop_delay }}"
   no_log: "{{ gateway_routes_secure_logging }}"
   async: 1000
   poll: 0
@@ -40,8 +40,8 @@
     jid: "{{ __gateway_routes_job_async_results_item.ansible_job_id }}"
   register: __gateway_routes_job_async_result
   until: __gateway_routes_job_async_result.finished
-  retries: "{{ routes_async_retries }}"
-  delay: "{{ routes_async_delay }}"
+  retries: "{{ gateway_routes_async_retries }}"
+  delay: "{{ gateway_routes_async_delay }}"
   loop: "{{ __gateway_routes_job_async.results }}"
   loop_control:
     loop_var: __gateway_routes_job_async_results_item

roles/gateway_service_nodes/tasks/main.yml

@@ -20,7 +20,7 @@
     loop_var: __gateway_service_nodes_item
     label: "{{ __operation.verb }} the Gateway service node {{ __gateway_service_nodes_item.name }}"
     pause: "{{ gateway_service_nodes_loop_delay }}"
-  no_log: "{{ service_nodes_secure_logging }}"
+  no_log: "{{ gateway_service_nodes_secure_logging }}"
   async: 1000
   poll: 0
   register: __gateway_service_nodes_job_async
@@ -34,14 +34,14 @@
     jid: "{{ __gateway_service_nodes_job_async_results_item.ansible_job_id }}"
   register: __gateway_service_nodes_job_async_result
   until: __gateway_service_nodes_job_async_result.finished
-  retries: "{{ service_nodes_async_retries }}"
-  delay: "{{ service_nodes_async_delay }}"
+  retries: "{{ gateway_service_nodes_async_retries }}"
+  delay: "{{ gateway_service_nodes_async_delay }}"
   loop: "{{ __gateway_service_nodes_job_async.results }}"
   loop_control:
     loop_var: __gateway_service_nodes_job_async_results_item
     label: "{{ __operation.verb }} Label {{ __gateway_service_nodes_job_async_results_item.__gateway_service_nodes_item.name }} | Wait for finish the Label {{ __operation.action }}"
   when: __gateway_service_nodes_job_async_results_item.ansible_job_id is defined
-  no_log: "{{ service_nodes_secure_logging }}"
+  no_log: "{{ gateway_service_nodes_secure_logging }}"
   vars:
     __operation: "{{ operation_translate[__gateway_service_nodes_job_async_results_item.state | default(platform_state) | default('present')] }}"
     ansible_async_dir: "{{ aap_configuration_async_dir }}"

roles/hub_ee_image/tasks/main.yml

@@ -17,7 +17,7 @@
   loop: "{{ ah_ee_images }}"
   loop_control:
     loop_var: __ee_image_item
-    label: "{{ __operation.verb }} the EE image {{ __ah_configuration_ee_image__item.name }} in Hub"
+    label: "{{ __operation.verb }} the EE image {{ __ee_image_item.name }} in Hub"
     pause: "{{ ah_configuration_ee_image_loop_delay }}"
   no_log: "{{ ah_configuration_ee_image_secure_logging }}"
   async: "{{ ah_configuration_ee_image_async_timeout }}"

tests/configs/gateway/service_cluster.yml

@@ -1,12 +1,13 @@
 ---
 # Cannot add more than one, cannot add existing type.
-# gateway_service_clusters:
-#   - name: Automation Controller
-#     service_type: controller
-#   - name: Automation Hub
-#     service_type: hub
-#   - name: Event Driven Automation
-#     service_type: eda
+gateway_service_clusters:
+  - name: "gateway"
+    service_type: "gateway"
+  - name: "hub"
+    service_type: "hub"
+  - name: "controller"
+    service_type: "controller"
+
 gateway_service_keys:
   - name: Test-Key 1
     is_active: true

tests/configs/gateway/services.yml

@@ -0,0 +1,34 @@
+---
+https_port_lookup: "{{ lookup('ansible.platform.gateway_api', 'http_ports', query_params={ 'is_api_port': true }, host=aap_hostname, username=aap_username, password=aap_password, verify_ssl=false, expect_one=true) }}"
+gateway_services_lookup: "{{ lookup('ansible.platform.gateway_api', 'services', query_params={ 'name': 'gateway api' }, host=aap_hostname, username=aap_username, password=aap_password, verify_ssl=false, expect_one=true) }}"
+service_node_name: "Node gateway - {{ aap_hostname | urlsplit('hostname') }}"
+gateway_service_node_lookup: "{{ lookup('ansible.platform.gateway_api', 'service_nodes', query_params={ 'name': service_node_name }, host=aap_hostname, username=aap_username, password=aap_password, verify_ssl=false, expect_one=true) }}"
+gateway_routes_lookup: "{{ lookup('ansible.platform.gateway_api', 'routes', query_params={ 'name': 'hub container registry' }, host=aap_hostname, username=aap_username, password=aap_password, verify_ssl=false, expect_one=true) }}"
+
+http_ports:
+  - name: "{{ https_port_lookup.name }}"
+    number: "{{ https_port_lookup.number | int }}"
+    use_https: true
+    is_api_port: true
+
+gateway_services:
+- name: Controller API
+  state: exists
+- name: gateway api
+  http_port: port-443
+  service_cluster: gateway
+  service_path: "/"
+  service_port: "{{ gateway_services_lookup.service_port | int }}"
+
+gateway_service_nodes:
+- name: "{{ service_node_name }}"
+  address: "{{ aap_hostname | urlsplit('hostname') }}"
+  service_cluster: "{{ gateway_service_node_lookup.service_cluster }}"
+
+gateway_routes:
+- name: "{{ gateway_routes_lookup.name }}"
+  description: "{{ gateway_routes_lookup.description }}"
+  http_port: "{{ gateway_routes_lookup.http_port }}"
+  enable_gateway_auth: "{{ gateway_routes_lookup.enable_gateway_auth }}"
+  service_cluster: "{{ gateway_routes_lookup.service_cluster }}"
+...

tests/configs/hub/ah_collections.yml

@@ -2,7 +2,7 @@
 ah_collections:
   - namespace: infra
     name: galaxy
-    path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/galaxy-galaxy-1.0.0.tar.gz"
+    path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/infra-aap_configuration-1.0.0.tar.gz"
     wait: true
     interaval: 5
     auto_approve: true
@@ -18,7 +18,7 @@ ah_collections:
 ah_collections_overwrite:
   - namespace: infra
     name: galaxy
-    path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/galaxy-galaxy-1.0.0.tar.gz"
+    path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/infra-aap_configuration-1.0.0.tar.gz"
     wait: true
     interaval: 5
     auto_approve: true

tests/configs/hub/ah_ee_images.yml

@@ -0,0 +1,8 @@
+ah_ee_images:
+  - name: config_as_code_ee
+    state: present
+    append: false
+    tags:
+      - v2
+      - "2.0"
+      - prod1