Fix some install issues

Change-Id: I6ad863bdb05e3ef7802395b8a4dcb737603bfb9a
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
This commit is contained in:
Guo Ruijing 2016-05-27 14:50:37 +08:00
parent 953703d2da
commit 10894a064c
8 changed files with 33 additions and 29 deletions

View File

@ -9,15 +9,30 @@ host=$1
nsh=$2
dpdk=$3
wget -r -nd -np http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs_package/ubuntu
if [ $nsh = 'true' ]
then
wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-nsh/
dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
dpkg -i openvswitch-common_2.5.90-1_amd64.deb
dpkg -i openvswitch-switch_2.5.90-1_amd64.deb
dpkg -i python-openvswitch_2.5.90-1_all.deb
if [ $dpdk = 'true' ]
then
dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
dpkg -i libdpdk0_2.2.0-1_amd64.deb
dpkg -i dpdk_2.2.0-1_amd64.deb
dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
fi
elif [ $dpdk = 'true' ]
then
wget -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/
dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
dpkg -i libdpdk0_2.2.0-1_amd64.deb
dpkg -i dpdk_2.2.0-1_amd64.deb
dpkg -i openvswitch-datapath-dkms_2.5.1-1_all.deb
dpkg -i openvswitch-common_2.5.1-1_amd64.deb
dpkg -i openvswitch-switch_2.5.1-1_amd64.deb
dpkg -i python-openvswitch_2.5.1-1_all.deb
dpkg -i openvswitch-switch-dpdk_2.5.1-1_amd64.deb
fi

View File

@ -1,10 +1,10 @@
$fuel_settings = parseyaml(file('/etc/astute.yaml'))
$master_ip = $::fuel_settings['master_ip']
$support_nsh = $::fuel_settings['fuel-plugin-ovs']['support_nsh']
$support_dpdk = $::fuel_settings['fuel-plugin-ovs']['support_dpdk']
$install_nsh = $::fuel_settings['fuel-plugin-ovs']['install_nsh']
$install_dpdk = $::fuel_settings['fuel-plugin-ovs']['install_dpdk']
if $operatingsystem == 'Ubuntu' {
exec { 'install ovs_nsh_dpdk':
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${support_nsh} ${support_dpdk}",
command => "curl http://${master_ip}:8080/plugins/fuel-plugin-ovs-0.9/deployment_scripts/install.sh | bash -s ${master_ip} ${install_nsh} ${install_dpdk}",
path => "/usr/bin:/usr/sbin:/bin:/sbin";
}
} elsif $operatingsystem == 'CentOS' {

View File

@ -1,17 +1,7 @@
- id: ovs_nsh_dpdk
type: group
role: ['compute']
requires: [deploy_start]
required_for: [deploy_end]
tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, ovs_install_compute]
parameters:
strategy:
type: parallel
- id: ovs_install_compute
type: puppet
version: 2.0.0
groups: [ovs_nsh_dpdk]
groups: [compute]
required_for: [pre_deployment_end]
requires: [pre_deployment_start]
parameters:

View File

@ -1,11 +1,11 @@
attributes:
support_dpdk:
install_dpdk:
type: "checkbox"
weight: 20
value: false
label: "support DPDK"
support_nsh:
label: "install DPDK"
install_nsh:
type: "checkbox"
weight: 20
value: false
label: "support NSH"
label: "install NSH"

View File

@ -1,7 +1,7 @@
# Plugin name
name: fuel-plugin-ovs
# Human-readable name for your plugin
title: Openvswitch with NSH/DPDK support
title: Install Openvswitch with NSH/DPDK
# Plugin version
version: '0.9.0'
# Description

View File

@ -43,6 +43,7 @@ dpdk (2.2.0-1) unstable; urgency=low
EOF
debian/rules build; fakeroot debian/rules binary
cd ${BUILD_HOME}; sudo dpkg -i *.deb
apt-get download libxenstore3.0
cd ${BUILD_HOME}
wget -c https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0.orig.tar.gz

View File

@ -43,6 +43,7 @@ dpdk (2.2.0-1) unstable; urgency=low
EOF
debian/rules build; fakeroot debian/rules binary
cd ${BUILD_HOME}; sudo dpkg -i *.deb
apt-get download libxenstore3.0
cd ${BUILD_HOME}
wget -c https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0.orig.tar.gz

View File

@ -8,20 +8,17 @@ DIR="$(dirname `readlink -f $0`)"
function build_pkg {
case $1 in
ubuntu)
rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
cd ${DIR}/ovs_build
sudo docker build -t ovs_build .
rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
rm -rf ${DIR}/tmp/; mkdir -p ${DIR}/tmp/; chmod 777 ${DIR}/tmp
sudo docker run -v ${DIR}/tmp:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
cp -r ${DIR}/tmp/*.deb ${DIR}/repositories/ubuntu
rm -rf ${DIR}/ovs-dpdk; mkdir -p ${DIR}/ovs-dpdk/; chmod 777 ${DIR}/ovs-dpdk
sudo docker run -v ${DIR}/ovs-dpdk:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
rm -rf ${DIR}/ovs_package/ubuntu; mkdir -p ${DIR}/ovs_package/ubuntu
rm -rf ${DIR}/tmp/; mkdir -p ${DIR}/tmp/; chmod 777 ${DIR}/tmp
sudo docker run -v ${DIR}/tmp:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
cp -r ${DIR}/tmp/*.deb ${DIR}/ovs_package/ubuntu
rm -rf ${DIR}/ovs-nsh; mkdir -p ${DIR}/ovs-nsh/; chmod 777 ${DIR}/ovs-nsh
sudo docker run -v ${DIR}/ovs-nsh:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
rm -rf ${DIR}/tmp/;
;;
*) echo "Not supported system"; exit 1;;
esac