Browse Source

Fix some install issues

Change-Id: I6ad863bdb05e3ef7802395b8a4dcb737603bfb9a
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Guo Ruijing 2 years ago
parent
commit
10894a064c

+ 16
- 1
deployment_scripts/install.sh View File

@@ -9,15 +9,30 @@ host=$1
9 9
 nsh=$2
10 10
 dpdk=$3
11 11
 
12
-wget -r -nd -np http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs_package/ubuntu
13 12
 
14 13
 if [ $nsh = 'true' ]
15 14
 then
15
+    wget  -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-nsh/
16 16
     dpkg -i openvswitch-datapath-dkms_2.5.90-1_all.deb
17 17
     dpkg -i openvswitch-common_2.5.90-1_amd64.deb
18 18
     dpkg -i openvswitch-switch_2.5.90-1_amd64.deb
19
+    dpkg -i python-openvswitch_2.5.90-1_all.deb
19 20
     if [ $dpdk = 'true' ]
20 21
     then
22
+        dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
23
+        dpkg -i libdpdk0_2.2.0-1_amd64.deb
24
+        dpkg -i dpdk_2.2.0-1_amd64.deb
21 25
         dpkg -i openvswitch-switch-dpdk_2.5.90-1_amd64.deb
22 26
     fi
27
+elif [ $dpdk = 'true' ]
28
+then
29
+    wget  -r -np -nH --cut-dirs=3 http://$host:8080/plugins/fuel-plugin-ovs-0.9/ovs-dpdk/
30
+    dpkg -i libxenstore3.0_4.4.2-0ubuntu0.14.04.5_amd64.deb
31
+    dpkg -i libdpdk0_2.2.0-1_amd64.deb
32
+    dpkg -i dpdk_2.2.0-1_amd64.deb
33
+    dpkg -i openvswitch-datapath-dkms_2.5.1-1_all.deb
34
+    dpkg -i openvswitch-common_2.5.1-1_amd64.deb
35
+    dpkg -i openvswitch-switch_2.5.1-1_amd64.deb
36
+    dpkg -i python-openvswitch_2.5.1-1_all.deb
37
+    dpkg -i openvswitch-switch-dpdk_2.5.1-1_amd64.deb
23 38
 fi

+ 3
- 3
deployment_scripts/puppet/manifests/ovs-install-compute.pp View File

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

+ 1
- 11
deployment_tasks.yaml View File

@@ -1,17 +1,7 @@
1
-- id: ovs_nsh_dpdk
2
-  type: group
3
-  role: ['compute']
4
-  requires: [deploy_start]
5
-  required_for: [deploy_end]
6
-  tasks: [hiera, setup_repositories, fuel_pkgs, globals, tools, logging, ovs_install_compute]
7
-  parameters:
8
-    strategy:
9
-      type: parallel
10
-
11 1
 - id: ovs_install_compute
12 2
   type: puppet
13 3
   version: 2.0.0
14
-  groups: [ovs_nsh_dpdk]
4
+  groups: [compute]
15 5
   required_for: [pre_deployment_end]
16 6
   requires: [pre_deployment_start]
17 7
   parameters:

+ 4
- 4
environment_config.yaml View File

@@ -1,11 +1,11 @@
1 1
 attributes:
2
-    support_dpdk:
2
+    install_dpdk:
3 3
       type: "checkbox"
4 4
       weight: 20
5 5
       value: false
6
-      label: "support DPDK"
7
-    support_nsh:
6
+      label: "install DPDK"
7
+    install_nsh:
8 8
       type: "checkbox"
9 9
       weight: 20
10 10
       value: false
11
-      label: "support NSH"
11
+      label: "install NSH"

+ 1
- 1
metadata.yaml View File

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

+ 1
- 0
ovs_build/build-ovs-dpdk.sh View File

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

+ 1
- 0
ovs_build/build-ovs-nsh-dpdk.sh View File

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

+ 6
- 9
pre_build_hook View File

@@ -8,20 +8,17 @@ DIR="$(dirname `readlink -f $0`)"
8 8
 function build_pkg {
9 9
   case $1 in
10 10
     ubuntu)
11
+      rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
12
+
11 13
       cd ${DIR}/ovs_build
12 14
       sudo docker build -t ovs_build .
13 15
 
14
-      rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
15
-      rm -rf ${DIR}/tmp/; mkdir -p ${DIR}/tmp/; chmod 777 ${DIR}/tmp
16
-      sudo docker run -v ${DIR}/tmp:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
17
-      cp -r ${DIR}/tmp/*.deb ${DIR}/repositories/ubuntu
16
+      rm -rf ${DIR}/ovs-dpdk; mkdir -p ${DIR}/ovs-dpdk/; chmod 777 ${DIR}/ovs-dpdk
17
+      sudo docker run -v ${DIR}/ovs-dpdk:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
18 18
 
19
-      rm -rf ${DIR}/ovs_package/ubuntu; mkdir -p ${DIR}/ovs_package/ubuntu
20
-      rm -rf ${DIR}/tmp/; mkdir -p ${DIR}/tmp/; chmod 777 ${DIR}/tmp
21
-      sudo docker run -v ${DIR}/tmp:/deb -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
22
-      cp -r ${DIR}/tmp/*.deb ${DIR}/ovs_package/ubuntu
19
+      rm -rf ${DIR}/ovs-nsh; mkdir -p ${DIR}/ovs-nsh/; chmod 777 ${DIR}/ovs-nsh
20
+      sudo docker run -v ${DIR}/ovs-nsh:/deb -t  ovs_build /ovs_build/build-ovs-nsh-dpdk.sh
23 21
 
24
-      rm -rf ${DIR}/tmp/;
25 22
       ;;
26 23
     *) echo "Not supported system"; exit 1;;
27 24
   esac

Loading…
Cancel
Save