Merge Newton private changes

- Add interface mapping data to hiera
- Add support for VPP interfaces
- Continue bringing up interfaces even if one fails
- Change hiera to json format

List of commits: https://github.com/openstack/os-net-config/compare/stable/newton...trozet:stable/danube

Change-Id: If7a2c6119bf613f1fc8846237b077cd8f0e26015
Signed-off-by: Feng Pan <fpan@redhat.com>

2 files changed, 32 insertions, 0 deletions

diff --git a/etc/os-net-config/samples/vpp_interface.json b/etc/os-net-config/samples/vpp_interface.json
new file mode 100644
index 0000000..5d2f82a
--- /dev/null
+++ b/etc/os-net-config/samples/vpp_interface.json
@@ -0,0 +1,14 @@
+{ "network_config": [
+    {
+        "type": "vpp_interface",
+        "name": "nic2",
+        "addresses": [
+          {
+            "ip_netmask": "192.0.2.1/24"
+          }
+        ],
+        "uio_driver": "uio_pci_generic",
+        "options": "vlan-strip-offload off"
+    }
+  ]
+}
diff --git a/etc/os-net-config/samples/vpp_interface.yaml b/etc/os-net-config/samples/vpp_interface.yaml
new file mode 100644
index 0000000..de790d5
--- /dev/null
+++ b/etc/os-net-config/samples/vpp_interface.yaml
@@ -0,0 +1,18 @@
+network_config:
+  -
+    type: vpp_interface
+    name: nic2
+    addresses:
+      -
+        ip_netmask: 192.0.2.1/24
+    # DPDK poll-mode driver name. Defaults to 'vfio-pci', other possible value
+    # is 'uio_pci_generic'. It is also possible to specify other driver names
+    # such as 'igb_uio', however, it is assumed that any required kernel
+    # modules for those drivers are already loaded when os-net-config is
+    # invoked.
+    uio_driver: uio_pci_generic
+    # Interface options such as vlan stripping and tx/rx transmit queues
+    # specification. Reference for those configurations can
+    # be found at https://wiki.fd.io/view/VPP/Command-line_Arguments
+    # Example: 'vlan-strip-offload on num-rx-queues 3'
+    #options: "vlan-strip-offload off"