aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-15 17:42:36 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-15 17:42:36 +0100
commit6dd9f2cda829e3e86a177c7b9b5cf8ca742bf2f7 (patch)
tree3ceda3b705b6a115ad72a6df9fc8ffb44accf701
parentd5239547e7e6d01b825d7cef2aa2b3a4041b0123 (diff)
Rebased NFVOVS to the new plugin arch
Change-Id: I4eb093c2fe4208975d08ffc2477e8ff04b213afd Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
-rw-r--r--deploy/config/plugins/fuel-nfvovs_0.0.2.yaml35
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml96
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml72
-rw-r--r--deploy/scenario/scenario.yaml4
4 files changed, 205 insertions, 2 deletions
diff --git a/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml b/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml
new file mode 100644
index 000000000..902938211
--- /dev/null
+++ b/deploy/config/plugins/fuel-nfvovs_0.0.2.yaml
@@ -0,0 +1,35 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# jonas.bjurel@ericsson.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: NFV OVS fuel Plugin configuration template
+ version: 0.2
+ created: Mon Feb 15 2016
+ comment: Rebased for new plugin arch
+
+fuel-plugin-ovsnfv:
+ metadata:
+ #chosen_id: Assigned during installation
+ class: plugin
+ default: false
+ enabled: true
+ label: Userspace OVS support
+ toggleable: true
+ versions:
+ - fuel-plugin-ovsnfv_text:
+ description: Specify compute node interface to which OVS-DPDK binds
+ label: NIC for DPDK
+ type: text
+ value: ens1f1
+ weight: 25
+ metadata:
+ always_editable: false
+ #plugin_id: Assigned during installation
+ plugin_version: 0.0.1
+ weight: 70
diff --git a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
new file mode 100644
index 000000000..b6197efa5
--- /dev/null
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
@@ -0,0 +1,96 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# jonas.bjurel@ericsson.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
+##############################################################################
+
+############################################################################### # Description:
+# This .yaml configuration file defines the configuration of the fuel
+# deployment and is passed as an argument to deploy.sh
+# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
+# This will make build.sh fetch this configuration file and configure the
+# deployment accordingly.
+# After the deployment, a copy of this file gets uploaded to fuel:
+# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
+# /root/deploy-config.sha1
+##############################################################################
+
+##############################################################################
+# deployment configuration meta-data
+deployment-scenario-metadata:
+ title: NFV OVS HA deployment
+ version: 0.0.4
+ created: Feb 15 2016
+ comment: Rebased to Fuel8
+
+##############################################################################
+# Stack extentions are opnfv added value features in form of a fuel-plugin
+# plug-ins listed below will be enabled and configured according to the
+# <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-ovsnfv
+ module-config-name: fuel-nfvovs
+ module-config-version: 0.0.2
+ module-config-override:
+ # Module config overrides
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ environment:
+ net_segment_type: tun
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: controller
+ transformations: transformations_1
+ - id: 2
+ interfaces: interfaces_1
+ role: mongo,controller
+ transformations: transformations_1
+ - id: 3
+ interfaces: interfaces_1
+ role: ceph-osd,controller
+ transformations: transformations_1
+ - id: 4
+ interfaces: interfaces_1
+ role: ceph-osd,compute
+ transformations: transformations_1
+ - id: 5
+ interfaces: interfaces_1
+ role: ceph-osd,compute
+ transformations: transformations_1
+dha-override-config:
+ nodes:
+ - id: 1
+ libvirtName: controller1
+ libvirtTemplate: templates/virtual_environment/vms/controller.xml
+ - id: 2
+ libvirtName: controller2
+ libvirtTemplate: templates/virtual_environment/vms/controller.xml
+ - id: 3
+ libvirtName: controller3
+ libvirtTemplate: templates/virtual_environment/vms/controller.xml
+ - id: 4
+ libvirtName: compute1
+ libvirtTemplate: templates/virtual_environment/vms/compute.xml
+ - id: 5
+ libvirtName: compute2
+ libvirtTemplate: templates/virtual_environment/vms/compute.xml
+ - id: 6
+ libvirtName: fuel-master
+ libvirtTemplate: templates/virtual_environment/vms/fuel.xml
+ isFuel: yes
+ username: root
+ password: r00tme
+
+##############################################################################
+# The verification pipeline may populate the section below with arbitrary
+# testing information, which post deploy can be retreived from the fuel master:
+# /root/deploy-config.yaml
+test:
diff --git a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
new file mode 100644
index 000000000..5a1c028f1
--- /dev/null
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
@@ -0,0 +1,72 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# jonas.bjurel@ericsson.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
+##############################################################################
+
+############################################################################### # Description:
+# This .yaml configuration file defines the configuration of the fuel
+# deployment and is passed as an argument to deploy.sh
+# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config
+# This will make build.sh fetch this configuration file and configure the
+# deployment accordingly.
+# After the deployment, a copy of this file gets uploaded to fuel:
+# /root/deploy-config.yaml, as well as the sha-1 sum of this file:
+# /root/deploy-config.sha1
+##############################################################################
+
+##############################################################################
+# deployment configuration meta-data
+deployment-scenario-metadata:
+ title: NFV OVS NO-HA deployment
+ version: 0.0.3
+ created: Feb 15 2016
+ comment: NFV OVS NO-HA Rebased for Fuel8
+
+##############################################################################
+# Stack extentions are opnfv added value features in form of a fuel-plugin
+# plug-ins listed below will be enabled and configured according to the
+# <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-ovsnfv
+ module-config-name: fuel-nfvovs
+ module-config-version: 0.0.2
+ module-config-override:
+ # Module config overrides
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ environment:
+ net_segment_type: tun
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: mongo,controller
+ transformations: transformations_1
+ - id: 2
+ interfaces: interfaces_1
+ role: ceph-osd,compute
+ transformations: transformations_1
+ - id: 3
+ interfaces: interfaces_1
+ role: ceph-osd,compute
+ transformations: transformations_1
+ - id: 4
+ interfaces: interfaces_1
+ role: ceph-osd,compute
+ transformations: transformations_1
+dha-override-config:
+# disks:
+# contrail: 500G
+
+##############################################################################
+# The verification pipeline may populate the section below with arbitrary
+# testing information, which post deploy can be retreived from the fuel master:
+# /root/deploy-config.yaml
+test:
diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index 799a2228c..40b9ad43f 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -63,10 +63,10 @@ os-nosdn-kvm-noha:
configfile: no-ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml
os-nosdn-ovs-ha:
- configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
+ configfile: ha_nfv-ovs_heat_ceilometer_scenario_0.0.4.yaml
os-nosdn-ovs-noha:
- configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.2.yaml
+ configfile: no-ha_nfv-ovs_heat_ceilometer_scenario_0.0.3.yaml
os-odl_l2-bgpvpn-ha: