fix all value files

Signed-off-by: Larry Peterson <[email protected]>

Author: llpeterson

roles/core/tasks/install.yml

@@ -28,7 +28,7 @@
   when: inventory_hostname in groups['master_nodes']
 
 - debug:
-    var: hostvars[inventory_hostname]
+    var: ran_subnet
   when: inventory_hostname in groups['master_nodes']
 
 - name: remove /tmp/sdcore-5g-values.yaml

roles/core/templates/radio-5g-values.yaml

@@ -218,14 +218,14 @@ omec-user-plane:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: {{ core.upf.access_subnet[:-3] }}
-        ip: {{ core.upf.access_subnet }}
+        gateway: {{ access_gw }}
+        ip: {{ access_ip }}
       core:
         ipam: static
         cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
-        gateway: {{ core.upf.core_subnet[:-3] }}
-        ip: {{ core.upf.core_subnet }} 
+        gateway: {{ core_gw }}
+        ip: {{ core_ip }}
       cfgFiles:
         upf.jsonc:
           mode: af_packet                # This mode implies no DPDK

roles/core/templates/sdcore-5g-sriov-values.yaml

@@ -325,15 +325,15 @@ omec-user-plane:
         cniPlugin: vfioveth    # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         resourceName: "intel.com/intel_sriov_vfio_access"
-        gateway: {{ core.upf.access_subnet[:-3] }}
-        ip: {{ core.upf.access_subnet }}
+        gateway: {{ access_gw }}
+        ip: {{ access_ip }}
       core:
         ipam: static
         cniPlugin: vfioveth    # Can be any other plugin. Dictates how IP address are assigned
         iface: {{ core.data_iface }}
         resourceName: "intel.com/intel_sriov_vfio_core"
-        gateway: {{ core.upf.core_subnet[:-3] }}
-        ip: {{ core.upf.core_subnet }}
+        gateway: {{ core_gw }}
+        ip: {{ core_ip }}
       cfgFiles:
         upf.jsonc:
           mode: dpdk

roles/upf/tasks/install.yml

@@ -23,8 +23,10 @@
     dest: /tmp/upf-{{ item.key }}.yaml
   vars:
     ran_subnet: "{{ran_subnet}}"
-    upf_access_ip: "{{ item.value.ip.access }}"
-    upf_core_ip:  "{{ item.value.ip.core }}"
+    access_gw: "{{ core.upf.access_subnet[:-3] }}"
+    core_gw: "{{ core.upf.core_subnet[:-3] }}"
+    upf_access_ip: "{{ item.value.ip.access + '/24' }}"
+    upf_core_ip: "{{ item.vaule.ip.core + '/24' }}"
     upf_ue_ip_pool: "{{ item.value.ue_ip_pool }}"
   with_dict: "{{ core.upf.additional_upfs}}"
   when: inventory_hostname in groups['master_nodes']

roles/upf/templates/upf-5g-values.yaml

@@ -31,13 +31,13 @@ config:
       ipam: static
       cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
       iface: {{ core.data_iface }}
-      gateway: {{ core.upf.access_subnet[:-3] }}
+      gateway: {{ access_gw }}
       ip: {{ upf_access_ip }}
     core:
       ipam: static
       cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
       iface: {{ core.data_iface }}
-      gateway: {{ core.upf.core_subnet[:-3] }}
+      gateway: {{ core_gw }}
       ip: {{ upf_core_ip }}
     cfgFiles:
       upf.jsonc: