Remove OVS with DPDK
Change-Id: I6999ef2219d21286ffe95f1dd67b440b543020ac Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
This commit is contained in:
parent
0e55761328
commit
24b1dd4464
|
@ -4,7 +4,7 @@ $master_ip = hiera('master_ip')
|
||||||
$ovs_settings = hiera('fuel-plugin-ovs')
|
$ovs_settings = hiera('fuel-plugin-ovs')
|
||||||
|
|
||||||
$install_nsh = $ovs_settings['install_nsh']
|
$install_nsh = $ovs_settings['install_nsh']
|
||||||
$install_dpdk = $ovs_settings['install_dpdk']
|
$install_dpdk = 'false'
|
||||||
|
|
||||||
if $operatingsystem == 'Ubuntu' {
|
if $operatingsystem == 'Ubuntu' {
|
||||||
if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
|
if (!roles_include(['primary-controller', 'controller'])) or $install_on_controller {
|
||||||
|
|
|
@ -8,16 +8,3 @@
|
||||||
puppet_manifest: puppet/manifests/ovs-install.pp
|
puppet_manifest: puppet/manifests/ovs-install.pp
|
||||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||||
timeout: 720
|
timeout: 720
|
||||||
|
|
||||||
- id: update_flavors
|
|
||||||
type: puppet
|
|
||||||
version: 2.1.0
|
|
||||||
role: [primary-controller]
|
|
||||||
requires: [post_deployment_start]
|
|
||||||
required_for: [post_deployment_end]
|
|
||||||
condition:
|
|
||||||
yaql_exp: $.get('fuel-plugin-ovs').install_dpdk
|
|
||||||
parameters:
|
|
||||||
puppet_manifest: puppet/manifests/ovs-update-flavors.pp
|
|
||||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
|
||||||
timeout: 720
|
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
attributes:
|
attributes:
|
||||||
install_dpdk:
|
|
||||||
type: "checkbox"
|
|
||||||
weight: 20
|
|
||||||
value: false
|
|
||||||
label: "Install DPDK"
|
|
||||||
install_nsh:
|
install_nsh:
|
||||||
type: "checkbox"
|
type: "checkbox"
|
||||||
weight: 20
|
weight: 20
|
||||||
|
|
|
@ -20,9 +20,6 @@ function build_pkg {
|
||||||
sudo docker build -t ovs_build .
|
sudo docker build -t ovs_build .
|
||||||
|
|
||||||
DEB_DIR=${DIR}/deb-ovs-dpdk
|
DEB_DIR=${DIR}/deb-ovs-dpdk
|
||||||
rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
|
|
||||||
sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
|
|
||||||
cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/
|
|
||||||
|
|
||||||
rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
|
rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
|
||||||
sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh.sh
|
sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh.sh
|
||||||
|
|
Loading…
Reference in New Issue