summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/config/dea_base.yaml2
-rw-r--r--deploy/config/plugins/fuel-nshovs_1.0.0.yaml37
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml28
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml28
4 files changed, 71 insertions, 24 deletions
diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml
index 14600a372..ce8199479 100644
--- a/deploy/config/dea_base.yaml
+++ b/deploy/config/dea_base.yaml
@@ -554,6 +554,8 @@ settings:
hwloc
+ i40e-dkms
+
linux-firmware
linux-headers-generic-lts-xenial
diff --git a/deploy/config/plugins/fuel-nshovs_1.0.0.yaml b/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
new file mode 100644
index 000000000..3c87d8b80
--- /dev/null
+++ b/deploy/config/plugins/fuel-nshovs_1.0.0.yaml
@@ -0,0 +1,37 @@
+##############################################################################
+# Copyright (c) 2016 Mirantis, Inc. and others.
+# mpolenchuk@mirantis.com
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+plugin-config-metadata:
+ title: NSHOVS fuel Plugin configuration template
+ version: 0.3
+ created: Dec 14 2016
+ comment: None
+
+fuel-plugin-ovs:
+ metadata:
+ #chosen_id: Choosen at install time
+ class: plugin
+ default: false
+ enabled: true
+ label: Openvswitch with NSH support
+ toggleable: true
+ versions:
+ - install_dpdk:
+ type: "checkbox"
+ weight: 20
+ value: false
+ label: "Install DPDK"
+ install_nsh:
+ type: "checkbox"
+ weight: 20
+ value: false
+ label: "Install NSH"
+ metadata:
+ plugin_version: 1.0.0
+ weight: 70
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 51deb4e28..9c689c95a 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: NFV OVS HA deployment
- version: 0.9.0
+ version: 1.0.0
created: Jul 12 2016
- comment: Rebased to Fuel9
+ comment: Rebased to Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,16 +32,20 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
- - module: fuel-plugin-ovs
- module-config-name: fuel-nshovs
- module-config-version: 0.9.0
- module-config-override:
- metadata:
- versions:
- - install_dpdk:
- value: true
- metadata:
- plugin_version: 0.9.0
+ #
+ # Disable this plugin since Fuel already has newer
+ # version of openvswitch out of the box
+ #
+ # - module: fuel-plugin-ovs
+ # module-config-name: fuel-nshovs
+ # module-config-version: 1.0.0
+ # module-config-override:
+ # metadata:
+ # versions:
+ # - install_dpdk:
+ # value: true
+ # metadata:
+ # plugin_version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 7ab76cbcf..8160e1826 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: NFV OVS NO-HA deployment
- version: 0.9.0
+ version: 1.0.0
created: Jul 12 2016
- comment: NFV OVS NO-HA Rebased for Fuel9
+ comment: NFV OVS NO-HA Rebased for Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,16 +32,20 @@ deployment-scenario-metadata:
# <module-config-base-uri>/<module-config-name>_<module-config-version>.yaml
# It does so by copying the config file to the local plugin config directory
stack-extensions:
- - module: fuel-plugin-ovs
- module-config-name: fuel-nshovs
- module-config-version: 0.9.0
- module-config-override:
- metadata:
- versions:
- - install_dpdk:
- value: true
- metadata:
- plugin_version: 0.9.0
+ #
+ # Disable this plugin since Fuel already has newer
+ # version of openvswitch out of the box
+ #
+ # - module: fuel-plugin-ovs
+ # module-config-name: fuel-nshovs
+ # module-config-version: 1.0.0
+ # module-config-override:
+ # metadata:
+ # versions:
+ # - install_dpdk:
+ # value: true
+ # metadata:
+ # plugin_version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary