Merge "Add pkg_map support to openvswitch elements"

elements/openvswitch-datapath/install.d/75-openvswitch-datapath

@@ -9,5 +9,5 @@ min=$(printf "%02d" ${KERNEL_VERSION#*.})
 # Open vSwitch GRE tunneling included in kernel 3.11 and
 # VXLAN tunneling in kernel 3.12
 if [[ $((10#$maj$min)) -lt 312 ]]; then
-    install-packages openvswitch-datapath-dkms
+    install-packages -m openvswitch-datapath openvswitch-datapath-dkms_package
 fi

elements/openvswitch-datapath/pkg-map

@@ -0,0 +1,10 @@
+{
+  "family": {
+    "debian": {
+      "openvswitch-datapath-dkms_package": "openvswitch-datapath-dkms"
+    },
+    "suse": {
+       "openvswitch-switch-dkms_package": "openvswitch-kmp"
+    }
+  }
+}

elements/openvswitch/install.d/74-openvswitch

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -eux
 
-install-packages openvswitch-switch
+install-packages -m openvswitch openvswitch-switch_package
 
 if [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
     os-svc-enable -n openvswitch-switch

elements/openvswitch/pkg-map

@@ -0,0 +1,10 @@
+{
+  "family": {
+    "redhat": {
+      "openvswitch-switch_package": "openvswitch"
+    }
+  },
+  "default": {
+    "openvswitch-switch_package": "openvswitch-switch"
+  }
+}