Merge pull request #20 from sureshmarikkannu/cniPlugin

Moved cniPlugin under access/core sections for upf-5g-values.yaml

Author: llpeterson

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

@@ -22,18 +22,20 @@ config:
       enabled: false    # SRIOV is disabled by default
     hugepage:
       enabled: false    # Should be enabled if DPDK is enabled
-    cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
-    ipam: static
     routes:
       - to: {{ ansible_default_ipv4.address }}
         via: 169.254.1.1
     enb:
       subnet: {{ ran_subnet }} # Subnet for the gNB network
     access:
+      ipam: static
+      cniPlugin: macvlan  # Can be any other plugin. Dictates how IP address are assigned
       iface: {{ core.data_iface }}
       gateway: 192.168.252.1
       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: 192.168.250.1
       ip: {{ upf_core_ip }}