summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-02-13 12:53:48 -0500
committerGuo Ruijing <ruijing.guo@intel.com>2017-02-13 13:21:28 -0500
commit24b1dd4464f6b86d73b15a4b3f0984a2d597750f (patch)
tree4299ce2d9d924a297d5970c63cb9e1844ffbcfaf
parent0e55761328ce3aa384043f0a280b89b2b75682fd (diff)
Remove OVS with DPDK
Change-Id: I6999ef2219d21286ffe95f1dd67b440b543020ac Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Notes
Notes (review): Code-Review+1: Alexandru Avadanii <alexandru.avadanii@enea.com> Code-Review+2: Ruijing <ruijing.guo@intel.com> Workflow+1: Ruijing <ruijing.guo@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 15 Feb 2017 00:52:34 +0000 Reviewed-on: https://review.openstack.org/433366 Project: openstack/fuel-plugin-ovs Branch: refs/heads/master
-rw-r--r--deployment_scripts/puppet/manifests/ovs-install.pp2
-rw-r--r--deployment_tasks.yaml13
-rw-r--r--environment_config.yaml5
-rwxr-xr-xpre_build_hook3
4 files changed, 1 insertions, 22 deletions
diff --git a/deployment_scripts/puppet/manifests/ovs-install.pp b/deployment_scripts/puppet/manifests/ovs-install.pp
index ed30bfd..dff5b31 100644
--- a/deployment_scripts/puppet/manifests/ovs-install.pp
+++ b/deployment_scripts/puppet/manifests/ovs-install.pp
@@ -4,7 +4,7 @@ $master_ip = hiera('master_ip')
4$ovs_settings = hiera('fuel-plugin-ovs') 4$ovs_settings = hiera('fuel-plugin-ovs')
5 5
6$install_nsh = $ovs_settings['install_nsh'] 6$install_nsh = $ovs_settings['install_nsh']
7$install_dpdk = $ovs_settings['install_dpdk'] 7$install_dpdk = 'false'
8 8
9if $operatingsystem == 'Ubuntu' { 9if $operatingsystem == 'Ubuntu' {
10 if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller { 10 if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index b8de3ed..59b2de0 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -8,16 +8,3 @@
8 puppet_manifest: puppet/manifests/ovs-install.pp 8 puppet_manifest: puppet/manifests/ovs-install.pp
9 puppet_modules: puppet/modules:/etc/puppet/modules 9 puppet_modules: puppet/modules:/etc/puppet/modules
10 timeout: 720 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
diff --git a/environment_config.yaml b/environment_config.yaml
index 3a1fe53..f04d641 100644
--- a/environment_config.yaml
+++ b/environment_config.yaml
@@ -1,9 +1,4 @@
1attributes: 1attributes:
2 install_dpdk:
3 type: "checkbox"
4 weight: 20
5 value: false
6 label: "Install DPDK"
7 install_nsh: 2 install_nsh:
8 type: "checkbox" 3 type: "checkbox"
9 weight: 20 4 weight: 20
diff --git a/pre_build_hook b/pre_build_hook
index 03c91c2..a955678 100755
--- a/pre_build_hook
+++ b/pre_build_hook
@@ -20,9 +20,6 @@ function build_pkg {
20 sudo docker build -t ovs_build . 20 sudo docker build -t ovs_build .
21 21
22 DEB_DIR=${DIR}/deb-ovs-dpdk 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 rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; 24 rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
28 sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh.sh 25 sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh.sh