Browse Source

Remove OVS with DPDK

Change-Id: I6999ef2219d21286ffe95f1dd67b440b543020ac
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Guo Ruijing 2 years ago
parent
commit
24b1dd4464

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

@@ -4,7 +4,7 @@ $master_ip      = hiera('master_ip')
4 4
 $ovs_settings   = hiera('fuel-plugin-ovs')
5 5
 
6 6
 $install_nsh    = $ovs_settings['install_nsh']
7
-$install_dpdk   = $ovs_settings['install_dpdk']
7
+$install_dpdk   = 'false'
8 8
 
9 9
 if $operatingsystem == 'Ubuntu' {
10 10
   if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {

+ 0
- 13
deployment_tasks.yaml View File

@@ -8,16 +8,3 @@
8 8
     puppet_manifest: puppet/manifests/ovs-install.pp
9 9
     puppet_modules: puppet/modules:/etc/puppet/modules
10 10
     timeout: 720
11
-
12
-- id: update_flavors
13
-  type: puppet
14
-  version: 2.1.0
15
-  role: [primary-controller]
16
-  requires: [post_deployment_start]
17
-  required_for: [post_deployment_end]
18
-  condition:
19
-    yaql_exp: $.get('fuel-plugin-ovs').install_dpdk
20
-  parameters:
21
-    puppet_manifest: puppet/manifests/ovs-update-flavors.pp
22
-    puppet_modules: puppet/modules:/etc/puppet/modules
23
-    timeout: 720

+ 0
- 5
environment_config.yaml View File

@@ -1,9 +1,4 @@
1 1
 attributes:
2
-    install_dpdk:
3
-      type: "checkbox"
4
-      weight: 20
5
-      value: false
6
-      label: "Install DPDK"
7 2
     install_nsh:
8 3
       type: "checkbox"
9 4
       weight: 20

+ 0
- 3
pre_build_hook View File

@@ -20,9 +20,6 @@ function build_pkg {
20 20
       sudo docker build -t ovs_build .
21 21
 
22 22
       DEB_DIR=${DIR}/deb-ovs-dpdk
23
-      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
24
-      sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-dpdk.sh
25
-      cp -r ${DEB_DIR}/*  ${DIR}/repositories/ubuntu/
26 23
 
27 24
       rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
28 25
       sudo docker run -v ${DEB_DIR}:/deb -t  ovs_build /ovs_build/build-ovs-nsh.sh

Loading…
Cancel
Save