openstack/tripleo-image-elements
Code Issues Proposed changes

Add pkg_map support to openvswitch elements

Browse Source 
Openvswitch elements install openvswitch from packages. This is not needed
on RH family distros, and on SuSE they use a different name.
Adding support for pkg_map so we can address all this differences.

Change-Id: I257ecede6f4fe0b7e6ee7b9ce660d5bfade06a1e
This commit is contained in:
Ghe Rivero 2014-07-08 03:04:32 +00:00
parent e2cd5fa267
commit 9a69a2ed8f
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/openvswitch-datapath/install.d/75-openvswitch-datapath
View File

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

10
elements/openvswitch-datapath/pkg-map Normal file
View File

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

2
elements/openvswitch/install.d/74-openvswitch
View File

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

10
elements/openvswitch/pkg-map Normal file
View File

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