← Back to branch summary

~sean-k-mooney/networking-ovs-dpdk/trunk

« back to all changes in this revision

Viewing changes to devstack/libs/ovs-dpdk

  • Committer: Gerrit Code Review
  • Author(s): Zuul
  • Date: 2018-08-17 09:41:50 UTC
  • mfrom: (319.2.2)
  • Revision ID: git-v1:73efac1c673122b2b4e4f058fddfe7be87ae48ad
Merge "make qemu wrapper condtional"

Show diffs side-by-side

added added

removed removed

Lines of Context:
devstack/libs/ovs-dpdk
145
145
# ovs cleanup
146
146
#
147
147
 
 
148
function cleanup_qemu_kvm_wrapper {
 
149
    if [ -e /usr/bin/kvm ]; then
 
150
        KVM_CMD="/usr/bin/kvm"
 
151
    elif [ -e /usr/bin/qemu-kvm ]; then
 
152
        KVM_CMD="/usr/bin/qemu-kvm"
 
153
    elif [ -e /usr/libexec/qemu-kvm ]; then
 
154
        KVM_CMD="/usr/libexec/qemu-kvm"
 
155
    fi
 
156
    if [ -e "$KVM_CMD.orig" ]; then
 
157
        sudo mv $KVM_CMD.orig $KVM_CMD
 
158
    fi
 
159
    if [ -e /usr/bin/qemu-system-x86_64.orig ]; then
 
160
            sudo mv /usr/bin/qemu-system-x86_64.orig /usr/bin/qemu-system-x86_64
 
161
    fi
 
162
}
 
163
 
148
164
function ovs_dpdk_db_cleanup {
149
165
    # remove all OVS ports that look like Neutron created ports
150
166
    for port in $(sudo ovs-vsctl list port | grep -o -e tap[0-9a-f\-]* -e q[rg]-[0-9a-f\-]*); do
155
171
    for bridge in $(sudo ovs-vsctl list-br | grep -o -e ${OVS_BRIDGE} -e ${PUBLIC_BRIDGE}); do
156
172
        sudo ovs-vsctl --no-wait del-br ${bridge}
157
173
    done
158
 
    if [ -e /usr/bin/kvm ]; then
159
 
        KVM_CMD="/usr/bin/kvm"
160
 
    elif [ -e /usr/bin/qemu-kvm ]; then
161
 
        KVM_CMD="/usr/bin/qemu-kvm"
162
 
    elif [ -e /usr/libexec/qemu-kvm ]; then
163
 
        KVM_CMD="/usr/libexec/qemu-kvm"
164
 
    fi
165
 
    if [ -e "$KVM_CMD.orig" ]; then
166
 
        sudo mv $KVM_CMD.orig $KVM_CMD
167
 
    fi
168
 
    if [ -e /usr/bin/qemu-system-x86_64.orig ]; then
169
 
            sudo mv /usr/bin/qemu-system-x86_64.orig /usr/bin/qemu-system-x86_64
 
174
    if [ "${OVS_DPDK_USE_QEMU_KVM_WRAPPER}" == "True" ]; then
 
175
        cleanup_qemu_kvm_wrapper
170
176
    fi
171
177
 
172
178
}
627
633
    sudo cp $NETWORKING_OVS_DPDK_DIR/devstack/ovs-dpdk/ovs-dpdk-init /etc/init.d/ovs-dpdk
628
634
    type systemctl 2>&1 >/dev/null && sudo systemctl daemon-reload
629
635
    ovs_dpdk_write_conf
630
 
    ovs_dpdk_create_kvm_wrapper
 
636
 
 
637
    if [ "${OVS_DPDK_USE_QEMU_KVM_WRAPPER}" == "True" ]; then
 
638
        ovs_dpdk_create_kvm_wrapper
 
639
    fi
631
640
 
632
641
    sudo chmod +x /etc/init.d/ovs-dpdk
633
642
    sudo service ovs-dpdk init