fix merge conflict
Merge branch 'master' of https://github.com/rcbops/jenkins-chef-nova-dingus
fix ovs install and add unmount func
revert an old change
Merge pull request #115 from rackerjoe/master

fix ovs install and add unmount func