Changing some variables and adding an IP validation [in-progress]

Author: falcocer-ibm

roles/maas/tasks/config_dhcpd.yml

@@ -4,22 +4,44 @@
   tags: config_dhcp
   block:
   # This section enables DHCP on the subnets included into the secrets repo group_vars and creates an IP range for them
+   - name: Verifying available ipranges
+     command: "maas {{ maas_admin_username }} ipranges read"
+     register: ip_ranges_raw
+
+   - name: Parse IP range JSON
+     set_fact:
+       ip_ranges: "{{ ip_ranges_raw.stdout | from_json }}"
+
+   - name: Check if range exists
+     set_fact:
+       range_exists: >-
+         {{
+           ip_ranges | selectattr('start_ip', 'equalto', '{{ subnet_data.start_ip }}')
+                     | selectattr('end_ip', 'equalto', '{{ subnet_data.end_ip }}')
+                     | list
+                     | length > 0
+         }}
+
+   - name: Debugging range_exists
+     debug:
+       var: range_exists  
+   
    - name: Creating IP Range for {{ subnet_name }} subnet
-     command: "maas admin ipranges create type={{ subnet_data.ip_range_type }} start_ip={{ subnet_data.start_ip }} end_ip={{ subnet_data.end_ip }}"
+     command: "maas {{ maas_admin_username }} ipranges create type={{ subnet_data.ip_range_type }} start_ip={{ subnet_data.start_ip }} end_ip={{ subnet_data.end_ip }}"
      ignore_errors: true
-     tags: skip
-   
-   - name: Selecting the correct fabric to configure {{ subnet_name }} subnet
-     command: bash -c "maas admin subnet read {{ subnet_data.cidr }}|grep 'fabric-'|cut -d '\"' -f 4"
-     register: fabric_selected
-   
-   - name: Getting {{ subnet_name }} subnet ID
-     command: bash -c "maas admin subnet read {{ subnet_data.cidr }}|grep '\"id\"'|cut -d ':' -f 2|cut -d ',' -f 1|head -1"
-     register: subnet_id
+
+   - name: Getting subnet information
+     command: "maas {{ maas_admin_username }} subnet read {{ subnet_data.cidr }}"
+     register: subnet_info
+
+   - name: Defining subnet variables
+     set_fact:
+       fabric_name: "{{ subnet_info.stdout | from_json | json_query('vlan.fabric') }}"
+       vlan_vid: "{{ subnet_info.stdout | from_json | json_query('vlan.vid') }}"
+       vlan_id: "{{ subnet_info.stdout | from_json | json_query('vlan.id') }}"
 
-   - name: Enabling DHCP with HA on {{ subnet_name }} subnet
-     command: "maas admin vlan update {{ fabric_selected.stdout }} 0 dhcp_on=True primary_rack={{ groups['maas_region_rack_server'][0] }} secondary_rack={{ groups['maas_rack_server'][0] }}"
-     tags: skip
+   - name: Enabling DHCP on {{ subnet_name }} subnet
+     command: "maas {{ maas_admin_username }} vlan update {{ fabric_name }} {{ vlan_vid }} dhcp_on=True primary_rack={{ groups['maas_region_rack_server'][0] }}"
 
    # This task creates the directory where the snippets are going to be copied
 
@@ -33,24 +55,24 @@
    # This section verifies if the snippets already exist
 
    - name: Verifying if the global dhcp snippet exists
-     command: bash -c "maas admin dhcpsnippets read|grep 'global_dhcp'"
+     command: bash -c "maas {{ maas_admin_username }} dhcpsnippets read|grep 'global_dhcp'"
      ignore_errors: true
      register: global_exists
 
    - name: Verifying if the {{ subnet_name }} subnet classes snippet exists
-     command: bash -c "maas admin dhcpsnippets read |grep '{{ subnet_name }}_classes'"
+     command: bash -c "maas {{ maas_admin_username }} dhcpsnippets read |grep '{{ subnet_name }}_classes'"
      when: subnet_data.classes is defined
      ignore_errors: true
      register: classes_exists
 
    - name: Verifying if the {{ subnet_name }} subnet pools snippet exists
-     command: bash -c "maas admin dhcpsnippets read |grep '{{ subnet_name }}_pools'"
+     command: bash -c "maas {{ maas_admin_username }} dhcpsnippets read |grep '{{ subnet_name }}_pools'"
      when: subnet_data.pools is defined
      ignore_errors: true
      register: pools_exists
 
    - name: Verifying if the {{ subnet_name }} subnet hosts snippet exists
-     command: bash -c "maas admin dhcpsnippets read |grep '{{ subnet_name }}_hosts'"
+     command: bash -c "maas {{ maas_admin_username }} dhcpsnippets read |grep '{{ subnet_name }}_hosts'"
      ignore_errors: true
      register: hosts_exists
 
@@ -131,19 +153,19 @@
    # This section deletes the snippets if already exist
 
    - name: Delete global DHCP snippet if already exists
-     command: "maas admin dhcpsnippet delete global_dhcp"
+     command: "maas {{ maas_admin_username }} dhcpsnippet delete global_dhcp"
      when: dhcp_global_config.changed == true and global_exists.failed == false
 
    - name: Delete {{ subnet_name }} subnet classes snippet if already exists
-     command: "maas admin dhcpsnippet delete {{ subnet_name }}_classes"
+     command: "maas {{ maas_admin_username }} dhcpsnippet delete {{ subnet_name }}_classes"
      when: subnet_data.classes is defined and dhcp_classes_config.changed == true and classes_exists.failed == false
 
    - name: Delete {{ subnet_name }} subnet pools snippet if already exists
-     command: "maas admin dhcpsnippet delete {{ subnet_name }}_pools"
+     command: "maas {{ maas_admin_username }} dhcpsnippet delete {{ subnet_name }}_pools"
      when: subnet_data.pools is defined and dhcp_pools_config.changed == true and pools_exists.failed == false
 
    - name: Delete {{ subnet_name }} subnet hosts snippet if already exists
-     command: "maas admin dhcpsnippet delete {{ subnet_name }}_hosts"
+     command: "maas {{ maas_admin_username }} dhcpsnippet delete {{ subnet_name }}_hosts"
      when: dhcp_hosts_config.changed == true and hosts_exists.failed == false
 
    # This section adds snippets into MAAS
@@ -153,13 +175,13 @@
      when: dhcp_global_config.failed == false and dhcp_global_config.changed == true
 
    - name: Adding {{ subnet_name }} classes snippets into MAAS
-     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_classes' value='{{ classes_content }}' description='This snippet configures the classes in {{ subnet_name }} subnet' subnet='{{ subnet_id.stdout }}'"
+     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_classes' value='{{ classes_content }}' description='This snippet configures the classes in {{ subnet_name }} subnet' subnet='{{ vlan_id }}'"
      when: dhcp_classes_config.failed == false and dhcp_classes_config.changed == true
 
    - name: Adding {{ subnet_name }} pools snippets into MAAS
-     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_pools' value='{{ pools_content }}' description='This snippet configures the pools in {{ subnet_name }} subnet' subnet='{{ subnet_id.stdout }}'"
+     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_pools' value='{{ pools_content }}' description='This snippet configures the pools in {{ subnet_name }} subnet' subnet='{{ vlan_id }}'"
      when: dhcp_pools_config.failed == false and dhcp_pools_config.changed == true
 
    - name: Adding {{ subnet_name }} hosts snippets into MAAS
-     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_hosts' value='{{ hosts_content }}' description='This snippet configures the hosts in {{ subnet_name }} subnet' subnet='{{ subnet_id.stdout }}'"
+     command: "maas {{ maas_admin_username }} dhcpsnippets create name='{{ subnet_name }}_hosts' value='{{ hosts_content }}' description='This snippet configures the hosts in {{ subnet_name }} subnet' subnet='{{ vlan_id }}'"
      when: dhcp_hosts_config.failed == false and dhcp_hosts_config.changed == true