feat(awx): inventory and inventory sources now configurable

!28

Author: jon-nfc

tasks/awx/inventory.yaml

@@ -1,57 +1,73 @@
 ---
 - name: Add inventory
   awx.awx.inventory:
-    name: "Production"
-    description: "{{ nfc_pb_awx_inventory.description | default('') }}"
     controller_host: "{{ nfc_pb_awx_controller_host | default(omit) }}"
     controller_oauthtoken: "{{ nfc_pb_awx_controller_oauthtoken | default(omit) }}"
     controller_username: "{{ nfc_pb_awx_controller_username | default(omit) }}"
     controller_password: "{{ nfc_pb_awx_controller_password | default(omit) }}"
     organization: "{{ nfc_pb_awx_organization.name }}"
-    state: present
     validate_certs: "{{ validate_certs | default(true) }}"
+
+    name: "{{ nfc_pb_awx_inventory.name }}"
+    description: "{{ nfc_pb_awx_inventory.description | default('') }}"
+    host_filter: "{{ nfc_pb_awx_inventory.host_filter | default('') }}"
+    instance_groups: "{{ nfc_pb_awx_inventory.instance_groups | default([]) }}"
+    prevent_instance_group_fallback: "{{ nfc_pb_awx_inventory.prevent_instance_group_fallback | default(false) | bool }}"
+    state: "{{ nfc_pb_awx_inventory.state | default('present') }}"
+    kind: "{{ nfc_pb_awx_inventory.kind | default(omit) }}"
   # no_log: true
   diff: true
 
 
 - name: Add an inventory source
   awx.awx.inventory_source:
-    name: "{{ nfc_pb_awx_project.name }}"
-    description: "{{ nfc_pb_awx_inventory.description | default('') }}"
     controller_host: "{{ nfc_pb_awx_controller_host | default(omit) }}"
     controller_oauthtoken: "{{ nfc_pb_awx_controller_oauthtoken | default(omit) }}"
     controller_username: "{{ nfc_pb_awx_controller_username | default(omit) }}"
     controller_password: "{{ nfc_pb_awx_controller_password | default(omit) }}"
     validate_certs: "{{ validate_certs | default(true) }}"
+
     organization: "{{ nfc_pb_awx_organization.name }}"
-    inventory: "Production"
+    source_project: "{{ nfc_pb_awx_project.name }}"
+    inventory: "{{ nfc_pb_awx_inventory.name }}"
+    name: "{{ nfc_pb_awx_inventory_source.name }}"
+    description: "{{ nfc_pb_awx_inventory_source.description | default('') }}"
+
     # credential: previously-created-credential
     # overwrite: True
     # update_on_launch: True
-    source_project: "{{ nfc_pb_awx_project.name }}"
-    source_path: inventory/production/
-    source: scm
-    state: present
-    verbosity: 2
-    overwrite: "{{ nfc_pb_awx_inventory.inventory_overwrite | default(true) | bool }}"
-    overwrite_vars: "{{ nfc_pb_awx_inventory.inventory_overwrite_vars | default(true) | bool }}"
-    scm_branch: "{{ nfc_pb_awx_inventory.scm_branch | default(omit) }}"
+
+    source_path: "{{ nfc_pb_awx_inventory_source.source_path | default(omit) }}"
+    source: "{{ nfc_pb_awx_inventory_source.source | default('scm') }}"
+    state: "{{ nfc_pb_awx_inventory_source.state | default('present') }}"
+    overwrite: "{{ nfc_pb_awx_inventory_source.overwrite | default(true) | bool }}"
+    overwrite_vars: "{{ nfc_pb_awx_inventory_source.overwrite_vars | default(true) | bool }}"
+    scm_branch: >-
+      {%- if nfc_pb_awx_project.scm_branch_allow_override | default(false) | bool -%}
+        {{ nfc_pb_awx_inventory_source.scm_branch | default(nfc_pb_awx_project.scm_branch) }}
+      {%- else -%}
+        {{ omit }}
+      {%- endif %}
+    verbosity: "{{ nfc_pb_awx_inventory_source.verbosity | default(0) | int }}"
   # no_log: true
   diff: true
+  loop: "{{ nfc_pb_awx_inventory.sources | default([]) | list }}"
+  loop_control:
+    loop_var: nfc_pb_awx_inventory_source
 
 
-- name: "Update inventory sources {{ nfc_pb_awx_project.name }}/{{ nfc_pb_awx_project.name }}"
-  awx.awx.inventory_source_update:
-    name: "{{ nfc_pb_awx_project.name }}"
-    inventory: "Production"
-    controller_host: "{{ nfc_pb_awx_controller_host | default(omit) }}"
-    controller_oauthtoken: "{{ nfc_pb_awx_controller_oauthtoken | default(omit) }}"
-    controller_username: "{{ nfc_pb_awx_controller_username | default(omit) }}"
-    controller_password: "{{ nfc_pb_awx_controller_password | default(omit) }}"
-    organization: "{{ nfc_pb_awx_organization.name }}"
-    validate_certs: "{{ validate_certs | default(true) }}"
-  # no_log: true
-  diff: true
+# - name: "Update inventory sources {{ nfc_pb_awx_project.name }}/{{ nfc_pb_awx_project.name }}"
+#   awx.awx.inventory_source_update:
+#     name: "{{ nfc_pb_awx_project.name }}"
+#     inventory: "Production"
+#     controller_host: "{{ nfc_pb_awx_controller_host | default(omit) }}"
+#     controller_oauthtoken: "{{ nfc_pb_awx_controller_oauthtoken | default(omit) }}"
+#     controller_username: "{{ nfc_pb_awx_controller_username | default(omit) }}"
+#     controller_password: "{{ nfc_pb_awx_controller_password | default(omit) }}"
+#     organization: "{{ nfc_pb_awx_organization.name }}"
+#     validate_certs: "{{ validate_certs | default(true) }}"
+#   # no_log: true
+#   diff: true
 
 
 - name: "RBAC - {{ nfc_pb_awx_organization.name }}/Project/{{ nfc_pb_awx_project.name }}/Inventory"

tasks/awx/job_template.yaml

@@ -55,7 +55,7 @@
         organization: "{{ nfc_pb_awx_organization.name }}"
         # inventory: "{{ nfc_pb_awx_inventory.name | default(omit) }}"
         project: "{{ nfc_pb_awx_project.name }}"
-        playbook: "{{ nfc_pb_awx_project.path | default('') }}{{ nfc_pb_awx_playbook_filename }}"
+        playbook: "{{ nfc_pb_awx_project.playbook_path | default('') }}{{ nfc_pb_awx_playbook_filename }}"
         # scm_branch: "{{ nfc_pb_awx_branch }}"
         ask_tags_on_launch: "{{ nfc_pb_awx_job_template.ask_tags_on_launch | default(false) | bool }}"
         ask_inventory_on_launch: "{{ nfc_pb_awx_job_template.ask_inventory_on_launch | default(true) | bool }}"
@@ -89,12 +89,7 @@
       loop: "{{ nfc_pb_awx_project.rbac.job }}"
       loop_control:
         loop_var: nfc_pb_awx_rbac
-      when:
-        (
-          nfc_pb_awx_project.type | lower == 'playbook'
-            or
-          nfc_pb_awx_project.type | lower == 'both'
-        )
+      when: nfc_pb_awx_project.playbook_path | default('') != ''
       vars:
         nfc_pb_awx_job_template_name: "{{ nfc_pb_awx_job_template.name }}"
 

tasks/awx/project.yaml

@@ -41,12 +41,10 @@
     - name: "Inventory - {{ nfc_pb_awx_organization.name }}/Project/{{ nfc_pb_awx_project.name }}"
       ansible.builtin.include_tasks:
         file: tasks/awx/inventory.yaml
-      when: >
-        (
-          nfc_pb_awx_project.type | lower == 'inventory'
-            or
-          nfc_pb_awx_project.type | lower == 'both'
-        )
+      loop: "{{ nfc_pb_awx_project.inventories | default([]) | list }}"
+      loop_control:
+        loop_var: nfc_pb_awx_inventory
+
 
     # - name: GIT Checkout Project
     #   ansible.builtin.git:
@@ -72,24 +70,21 @@
         # # depth: 1
         # version: "{{ nfc_pb_awx_project.scm_branch | default('master') }}"
         # # single_branch: true
-      when: >
-        nfc_pb_awx_project.scm_url | default('') != ''
-          and
-        nfc_pb_awx_project.type | lower == 'playbook'
+      when: nfc_pb_awx_project.playbook_path is defined
 
 
     - name: Add Job templates
       ansible.builtin.include_tasks:
         file: tasks/awx/job_templates.yaml
-      loop: "{{ lookup('community.general.filetree', '/tmp/project/' + path | default('')) }}"
+      loop: "{{ lookup('community.general.filetree', '/tmp/project/' + nfc_pb_awx_project.playbook_path | default('')) }}"
       when: >
         item.state == 'file'
           and
         'yaml' in item.path
           and
         item.path|basename|replace(".yaml","") not in nfc_pb_awx_project.job_template_ignore | default([])
           and
-        nfc_pb_awx_project.type | lower == 'playbook'
+        nfc_pb_awx_project.playbook_path is defined
       vars:
         nfc_pb_awx_playbook_filename: "{{ item.path }}"
         nfc_pb_awx_playbook_dir: "{{ item.root }}"