aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/cloud/configure_nodes.py39
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml3
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.1.yaml91
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.2.yaml91
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.3.yaml117
-rw-r--r--deploy/config/plugins/fuel-odl_1.0.0.yaml151
-rw-r--r--deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml163
-rw-r--r--deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml2
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml28
-rw-r--r--deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml142
-rw-r--r--deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml2
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml8
-rw-r--r--deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml28
-rw-r--r--deploy/scenario/scenario.yaml6
18 files changed, 506 insertions, 382 deletions
diff --git a/deploy/cloud/configure_nodes.py b/deploy/cloud/configure_nodes.py
index f9f65afb5..a50973af6 100644
--- a/deploy/cloud/configure_nodes.py
+++ b/deploy/cloud/configure_nodes.py
@@ -32,27 +32,20 @@ class ConfigureNodes(object):
def config_nodes(self):
log('Configure nodes')
- # Super dirty fix since Fuel 7 requires user defined roles to be
- # assigned before anything else (BUG fixed in Fuel 8)!
+ # Assign nodes to environment with given roles
for node_id, roles_blade in self.node_id_roles_dict.iteritems():
- if "opendaylight" in roles_blade[0] or "onos" in roles_blade[0] or "contrail" in roles_blade[0]:
- exec_cmd('fuel node set --node-id %s --role %s --env %s'
- % (node_id, roles_blade[0], self.env_id))
+ exec_cmd('fuel node set --node-id %s --role %s --env %s'
+ % (node_id, roles_blade[0], self.env_id))
for node_id, roles_blade in self.node_id_roles_dict.iteritems():
- if "opendaylight" not in roles_blade[0] and "onos" not in roles_blade[0] and "contrail" not in roles_blade[0]:
- exec_cmd('fuel node set --node-id %s --role %s --env %s'
- % (node_id, roles_blade[0], self.env_id))
-
- for node_id, roles_blade in self.node_id_roles_dict.iteritems():
- # Modify node attributes
- self.download_attributes(node_id)
- self.modify_node_attributes(node_id, roles_blade)
- self.upload_attributes(node_id)
# Modify interfaces configuration
self.download_interface_config(node_id)
self.modify_node_interface(node_id, roles_blade)
self.upload_interface_config(node_id)
+ # Modify node attributes
+ self.download_attributes(node_id)
+ self.modify_node_attributes(node_id, roles_blade)
+ self.upload_attributes(node_id)
# Currently not used, we use default deployment facts
# which are generated by fuel based on type segmentation
@@ -142,7 +135,8 @@ class ConfigureNodes(object):
# ens5:
# - interface_properties:
# dpdk:
- # enabled: true
+ # enabled:
+ # value: true
# - private
# ens6:
# - public
@@ -169,19 +163,19 @@ class ConfigureNodes(object):
if interface['name'] in interface_config:
for prop in interface_config[interface['name']]:
net = {}
- #net name
+ # net name
if isinstance(prop, six.string_types):
net['id'] = net_name_id[prop]
net['name'] = prop
interface['assigned_networks'].append(net)
- #network properties
+ # network properties
elif isinstance(prop, dict):
- if not 'interface_properties' in prop:
- log('Interface configuration contain unknow dict: %s' % prop)
+ if 'interface_properties' not in prop:
+ log('Interface configuration contains unknown dict: %s' % prop)
continue
- interface['interface_properties'] = \
- self._merge_dicts(interface.get('interface_properties', {}),
- prop.get('interface_properties', {}))
+ interface['attributes'] = self._merge_dicts(
+ interface.get('attributes', {}),
+ prop.get('interface_properties', {}))
with io.open(interface_yaml, 'w') as stream:
yaml.dump(interfaces, stream, default_flow_style=False)
@@ -198,4 +192,3 @@ class ConfigureNodes(object):
continue
result[k] = copy.deepcopy(v)
return result
-
diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
index 32b2cfb22..852b363d4 100644
--- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index cb80e3855..150d4ed06 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
index 92cc0e616..be80b9724 100644
--- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
index ed7c63fac..35a2201cf 100644
--- a/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/intel-sc/fuel/config/dea-pod-override.yaml
@@ -35,7 +35,8 @@ interfaces_dpdk:
- private
- interface_properties:
dpdk:
- enabled: true
+ enabled:
+ value: true
ens6:
- public
interfaces_vlan:
diff --git a/deploy/config/plugins/fuel-odl_0.0.1.yaml b/deploy/config/plugins/fuel-odl_0.0.1.yaml
deleted file mode 100644
index 53c510557..000000000
--- a/deploy/config/plugins/fuel-odl_0.0.1.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# 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: OpenDaylight fuel Plugin configuration template
- version: 0.1
- created: Mon Dec 28 2015
- comment: None
-
-opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - enable_gbp:
- label: GBP features
- type: checkbox
- value: false
- weight: 14
- enable_l3_odl:
- label: Use ODL to manage L3 traffic
- restrictions:
- - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation
- type.
- - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
- public network to all nodes
- type: checkbox
- value: true
- weight: 12
- enable_sfc:
- label: SFC features
- type: checkbox
- value: false
- weight: 13
- metadata:
- always_editable: false
- odl_features:
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gbp:
- - odl-groupbasedpolicy-base
- - odl-groupbasedpolicy-ofoverlay
- ovs:
- - odl-ovsdb-openstack
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- sfc:
- - odl-sfc-core
- - odl-sfc-sb-rest
- - odl-sfc-ui
- - odl-sfc-netconf
- - odl-sfc-ovs
- - odl-sfcofl2
- - odl-sfc-test-consumer
- vpn:
- - odl-vpnservice-api
- - odl-vpnservice-impl
- - odl-vpnservice-impl-rest
- - odl-vpnservice-impl-ui
- - odl-vpnservice-core
- # plugin_id: Assigned during installation
- plugin_version: 0.8.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- rest_api_port:
- description: Port on which ODL REST API will be available.
- label: Port number
- regex:
- error: Invalid port number
- source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
- type: text
- value: '8282'
- weight: 40
- weight: 70
diff --git a/deploy/config/plugins/fuel-odl_0.0.2.yaml b/deploy/config/plugins/fuel-odl_0.0.2.yaml
deleted file mode 100644
index bd2ef5bb2..000000000
--- a/deploy/config/plugins/fuel-odl_0.0.2.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-##############################################################################
-# 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: OpenDaylight fuel Plugin configuration template
- version: 0.2
- created: Tue Jan 26 2016
- comment: Rebased to Fuel8 and BE ODL plugin
-opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - enable_gbp:
- label: GBP features
- type: checkbox
- value: false
- weight: 14
- enable_l3_odl:
- label: Use ODL to manage L3 traffic
- restrictions:
- - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation
- type.
- - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
- public network to all nodes
- type: checkbox
- value: false
- weight: 12
- enable_sfc:
- label: SFC features
- type: checkbox
- value: false
- weight: 13
- metadata:
- always_editable: false
- odl_features:
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gbp:
- - odl-groupbasedpolicy-base
- - odl-groupbasedpolicy-ofoverlay
- ovs:
- - odl-ovsdb-openstack
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- sfc:
- - odl-sfc-core
- - odl-sfc-sb-rest
- - odl-sfc-ui
- - odl-sfc-netconf
- - odl-sfc-ovs
- - odl-sfcofl2
- - odl-sfc-test-consumer
- vpn:
- - odl-vpnservice-api
- - odl-vpnservice-impl
- - odl-vpnservice-impl-rest
- - odl-vpnservice-impl-ui
- - odl-vpnservice-core
- - odl-vpnservice-openstack
- # plugin_id: Assigned during installation
- plugin_version: 0.8.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- rest_api_port:
- description: Port on which ODL REST API will be available.
- label: Port number
- regex:
- error: Invalid port number
- source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
- type: text
- value: '8282'
- weight: 40
- weight: 70
diff --git a/deploy/config/plugins/fuel-odl_0.0.3.yaml b/deploy/config/plugins/fuel-odl_0.0.3.yaml
deleted file mode 100644
index 5c0078dbf..000000000
--- a/deploy/config/plugins/fuel-odl_0.0.3.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-##############################################################################
-# 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: OpenDaylight fuel Plugin configuration template
- version: 0.3
- created: 04.03.2016
- comment: Added bgpvpn feature
-opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - enable_gbp:
- label: GBP features
- type: checkbox
- value: false
- weight: 14
- enable_l3_odl:
- label: Use ODL to manage L3 traffic
- restrictions:
- - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation
- type.
- - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
- public network to all nodes
- type: checkbox
- value: false
- weight: 12
- enable_sfc:
- label: SFC features
- type: checkbox
- value: false
- weight: 13
- enable_bgpvpn:
- weight: 13
- type: "checkbox"
- value: false
- label: "BGPVPN extensions"
- description:
- >
- This enables the bgpvpn extension of neutron togethere with the
- corresponding sdnvpn features in odl. This feature will disable
- the standart ovsdb feature from ODL.
- restrictions:
- - condition: "settings:bgpvpn == null or settings:bgpvpn.metadata.enabled == false"
- strict: false
- message: "BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled."
- - networking_parameters:segmentation_type == 'vlan': This feature works only with segmentation_type != vlan
- - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false"
- strict: false
- message: "Openvswitch with NSH support (fuel-plugin-ovs) must be installed and enabled."
- bgpvpn_gateway:
- weight: 13
- type: "text"
- value: "0.0.0.0"
- description: "Define the default gateway for BGPVPN"
- label: "Default Gateway"
- restrictions:
- - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN is enabled.
- regex:
- source: ^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
- error: 'Invalid ip number'
- metadata:
- always_editable: false
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- odl_features:
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- odl-default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- gbp:
- - odl-groupbasedpolicy-neutronmapper
- - odl-groupbasedpolicy-ofoverlay
- ovs:
- - odl-ovsdb-openstack
- sfc:
- - odl-sfc-model
- - odl-sfc-provider
- - odl-sfc-provider-rest
- - odl-sfc-sb-rest
- - odl-sfc-ui
- - odl-sfc-netconf
- - odl-sfc-ovs
- - odl-sfcofl2
- vpn:
- - odl-vpnservice-openstack
- # plugin_id: Assigned during installation
- plugin_version: 0.8.1
- rest_api_port:
- value: '8282'
- label: 'Port number'
- description: 'Port on which ODL REST API will be available.'
- weight: 40
- type: "text"
- regex:
- source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
- error: 'Invalid port number'
- weight: 70
diff --git a/deploy/config/plugins/fuel-odl_1.0.0.yaml b/deploy/config/plugins/fuel-odl_1.0.0.yaml
new file mode 100644
index 000000000..c223130f3
--- /dev/null
+++ b/deploy/config/plugins/fuel-odl_1.0.0.yaml
@@ -0,0 +1,151 @@
+##############################################################################
+# Copyright (c) 2015,2016 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: OpenDaylight fuel Plugin configuration template
+ version: 0.5
+ created: 07.12.2016
+ comment: Fuel 10 support
+opendaylight:
+ metadata:
+ #chosen_id: Assigned during installation
+ class: plugin
+ default: false
+ enabled: true
+ label: OpenDaylight plugin
+ toggleable: true
+ versions:
+ - enable_l3_odl:
+ weight: 10
+ type: "checkbox"
+ value: false
+ label: "Use ODL to manage L3 traffic"
+ restrictions:
+ - networking_parameters:segmentation_type == 'vlan': Use tunneling segmentation type.
+ - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign public network to all nodes
+ enable_sfc:
+ weight: 20
+ type: "checkbox"
+ value: false
+ label: "SFC features"
+ sfc_class:
+ weight: 21
+ type: "select"
+ value: "ncr"
+ label: "Classifier used by SFC"
+ values:
+ - data: "ncr"
+ label: "NetVirt"
+ - data: "gcr"
+ label: "GBP"
+ description:
+ >
+ Classifier determines what traffic needs to be chained based on policy based on yang model.
+ The OpenDayLight actually supports the OVSDB NetVirt and the GBP classifier in case of SFC.
+ restrictions:
+ - condition: "settings:opendaylight.enable_sfc.value == false"
+ action: "hide"
+ enable_bgpvpn:
+ weight: 40
+ type: "checkbox"
+ value: false
+ label: "BGPVPN extensions"
+ description:
+ >
+ This enables the bgpvpn extension of neutron together with the
+ corresponding sdnvpn features in odl. This feature will disable
+ the standard ovsdb feature from ODL.
+ restrictions:
+ - condition: "settings:bgpvpn == null or settings:bgpvpn.metadata.enabled == false"
+ strict: false
+ message: "BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled."
+ - networking_parameters:segmentation_type == 'vlan': This feature works only with segmentation_type != vlan
+ - condition: "settings:opendaylight.enable_l3_odl.value == false"
+ strict: false
+ message: "OpenDaylight must be acting as the L3 controller for the bgpvpn features to be enabled."
+ - condition: "settings:opendaylight.deb_version.value != '5.2.0-1'"
+ strict: false
+ message: "The BGPVPN features only support OpenDaylight 5.2.0-1. The OpenDaylight package version field must be set to that value."
+ odl_v2:
+ weight: 60
+ type: "checkbox"
+ value: false
+ label: "Use V2 ML2 driver"
+ description: "V2 version is considered as experimental"
+ rest_api_port:
+ value: '8282'
+ label: 'Port number'
+ description: 'Port on which ODL REST API will be available.'
+ weight: 70
+ type: "text"
+ regex:
+ source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+ error: 'Invalid port number'
+ java_min_mem:
+ value: '1g'
+ label: 'Java -Xms option'
+ description: 'Initial memory allocation pool.'
+ weight: 80
+ type: "text"
+ java_max_mem:
+ value: '2g'
+ label: 'Java -Xmx option'
+ description: 'Maximum memory allocation pool.'
+ weight: 81
+ type: "text"
+ java_extra_opts:
+ value: '-XX:+UseG1GC'
+ label: 'Java extra options'
+ description: 'Additional options.'
+ weight: 82
+ type: "text"
+ deb_version:
+ value: '5.0.0-1'
+ label: 'OpenDaylight package version'
+ description: 'Plugin can be build with more than one version of ODL.'
+ weight: 90
+ type: "text"
+ metadata:
+ restrictions:
+ - "cluster:net_provider != 'neutron'": "Only neutron is supported by OpenDaylight"
+ odl_features:
+ default:
+ - config
+ - standard
+ - region
+ - package
+ - kar
+ - ssh
+ - management
+ odl-default:
+ - odl-restconf-all
+ - odl-aaa-authn
+ - odl-dlux-all
+ gcr:
+ - odl-groupbasedpolicy-ovssfc
+ ncr:
+ - odl-ovsdb-sfc
+ - odl-ovsdb-sfc-rest
+ ovsdb:
+ - odl-ovsdb-openstack
+ netvirt:
+ - odl-netvirt-openstack
+ sfc:
+ - odl-sfc-model
+ - odl-sfc-provider
+ - odl-sfc-provider-rest
+ - odl-sfc-ovs
+ - odl-sfc-openflow-renderer
+ default_credentials:
+ user: admin
+ password: admin
+ jetty_port: 8181
+ #plugin_id: Assigned during installation
+ plugin_version: 1.0.0
+ weight: 70
diff --git a/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
new file mode 100644
index 000000000..01767ee1a
--- /dev/null
+++ b/deploy/scenario/ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -0,0 +1,163 @@
+##############################################################################
+# 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 KVM and OVS-DPDK HA deployment
+ version: 0.0.1
+ created: Dec 20 2016
+ comment: NFV KVM and OVS-DPDK
+
+##############################################################################
+# 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-kvm
+ module-config-name: fuel-nfvkvm
+ module-config-version: 1.0.0
+ module-config-override:
+ # Module config overrides
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ fuel:
+ FEATURE_GROUPS:
+ - experimental
+ environment:
+ net_segment_type: vlan
+ nodes:
+ - id: 1
+ interfaces: interfaces_vlan
+ role: controller
+ - id: 2
+ interfaces: interfaces_vlan
+ role: mongo,controller
+ - id: 3
+ interfaces: interfaces_vlan
+ role: ceph-osd,controller
+ - id: 4
+ interfaces: interfaces_dpdk
+ role: ceph-osd,compute
+ attributes: attributes_1
+ - id: 5
+ interfaces: interfaces_dpdk
+ role: ceph-osd,compute
+ attributes: attributes_1
+
+ attributes_1:
+ hugepages:
+ dpdk:
+ value: 1024
+ nova:
+ value:
+ '2048': 1024
+
+ network:
+ networking_parameters:
+ segmentation_type: vlan
+ vlan_range:
+ - 1000
+ - 1030
+ networks:
+ - cidr: null
+ gateway: null
+ ip_ranges: []
+ meta:
+ configurable: false
+ map_priority: 2
+ name: private
+ neutron_vlan_range: true
+ notation: null
+ render_addr_mask: null
+ render_type: null
+ seg_type: vlan
+ use_gateway: false
+ vlan_start: null
+ name: private
+ vlan_start: null
+
+ settings:
+ editable:
+ storage:
+ ephemeral_ceph:
+ description: Configures Nova to store ephemeral volumes in RBD. This works
+ best if Ceph is enabled for volumes and images, too. Enables live migration
+ of all types of Ceph backed VMs (without this option, live migration will
+ only work with VMs launched from Cinder volumes).
+ label: Ceph RBD for ephemeral volumes (Nova)
+ type: checkbox
+ value: true
+ weight: 75
+ images_ceph:
+ description: Configures Glance to use the Ceph RBD backend to store images.
+ If enabled, this option will prevent Swift from installing.
+ label: Ceph RBD for images (Glance)
+ restrictions:
+ - settings:storage.images_vcenter.value == true: Only one Glance backend could
+ be selected.
+ type: checkbox
+ value: true
+ weight: 30
+ iser:
+ description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
+ label: iSER protocol for volumes (Cinder)
+ restrictions:
+ - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
+ - action: hide
+ condition: not ('experimental' in version:feature_groups)
+ type: checkbox
+ value: false
+ weight: 11
+
+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/ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 9c689c95a..245f0f28d 100644
--- a/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -78,7 +78,7 @@ dea-override-config:
attributes_1:
hugepages:
dpdk:
- value: 128
+ value: 1024
nova:
value:
'2048': 1024
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 90c89aedc..356abb07e 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL-L2 HA deployment
- version: 0.0.4
- created: Jun 02 2016
- comment: Rebased to Fuel9
+ version: 0.0.5
+ created: Dec 07 2016
+ comment: Rebased to Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.9.0
+ module-config-version: 1.0.0
module-config-override:
# Note that the module substitionion does not support arrays
# This is a quick fix
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index 967e7d295..43eb9029b 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL-L3 HA deployment
- version: 0.0.5
- created: Jun 02 2016
- comment: Rebased to Fuel9
+ version: 0.0.6
+ created: Dec 07 2016
+ comment: Rebased to Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -36,32 +36,14 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.9.0
+ module-config-version: 1.0.0
module-config-override:
metadata:
versions:
- enable_l3_odl:
value: true
metadata:
- plugin_version: 0.9.0
-
- - module: fuel-plugin-ovs
- module-config-name: fuel-nshovs
- module-config-version: 0.9.0
-
-# - module: opendaylight
-# module-config-name: fuel-odl
-# module-config-version: 0.0.2
-# module-config-override:
-# # Module config overrides
-# rest_api_port:
-# value: '8282'
-# enable_gbp:
-# value: false
-# enable_l3_odl:
-# value: true
-# enable_sfc:
-# value: false
+ plugin_version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
diff --git a/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
new file mode 100644
index 000000000..e932d661e
--- /dev/null
+++ b/deploy/scenario/no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
@@ -0,0 +1,142 @@
+##############################################################################
+# 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 KVM and OVS-DPDK No-HA deployment
+ version: 0.0.1
+ created: Dec 20 2016
+ comment: NFV KVM and OVS-DPDK
+
+##############################################################################
+# 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-kvm
+ module-config-name: fuel-nfvkvm
+ module-config-version: 1.0.0
+ module-config-override:
+ # Module config overrides
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ fuel:
+ FEATURE_GROUPS:
+ - experimental
+ environment:
+ net_segment_type: vlan
+ nodes:
+ - id: 1
+ interfaces: interfaces_vlan
+ role: mongo,controller
+ - id: 2
+ interfaces: interfaces_dpdk
+ role: ceph-osd,compute
+ attributes: attributes_1
+ - id: 3
+ interfaces: interfaces_dpdk
+ role: ceph-osd,compute
+ attributes: attributes_1
+ - id: 4
+ interfaces: interfaces_dpdk
+ role: ceph-osd,compute
+ attributes: attributes_1
+
+ attributes_1:
+ hugepages:
+ dpdk:
+ value: 256
+ min: 256
+ nova:
+ value:
+ '2048': 1024
+
+ network:
+ networking_parameters:
+ segmentation_type: vlan
+ vlan_range:
+ - 1000
+ - 1030
+ networks:
+ - cidr: null
+ gateway: null
+ ip_ranges: []
+ meta:
+ configurable: false
+ map_priority: 2
+ name: private
+ neutron_vlan_range: true
+ notation: null
+ render_addr_mask: null
+ render_type: null
+ seg_type: vlan
+ use_gateway: false
+ vlan_start: null
+ name: private
+ vlan_start: null
+
+ settings:
+ editable:
+ storage:
+ ephemeral_ceph:
+ description: Configures Nova to store ephemeral volumes in RBD. This works
+ best if Ceph is enabled for volumes and images, too. Enables live migration
+ of all types of Ceph backed VMs (without this option, live migration will
+ only work with VMs launched from Cinder volumes).
+ label: Ceph RBD for ephemeral volumes (Nova)
+ type: checkbox
+ value: true
+ weight: 75
+ images_ceph:
+ description: Configures Glance to use the Ceph RBD backend to store images.
+ If enabled, this option will prevent Swift from installing.
+ label: Ceph RBD for images (Glance)
+ restrictions:
+ - settings:storage.images_vcenter.value == true: Only one Glance backend could
+ be selected.
+ type: checkbox
+ value: true
+ weight: 30
+ iser:
+ description: 'High performance block storage: Cinder volumes over iSER protocol (iSCSI over RDMA). This feature requires SR-IOV capabilities in the NIC, and will use a dedicated virtual function for the storage network.'
+ label: iSER protocol for volumes (Cinder)
+ restrictions:
+ - settings:storage.volumes_lvm.value != true or settings:common.libvirt_type.value != 'kvm'
+ - action: hide
+ condition: not ('experimental' in version:feature_groups)
+ type: checkbox
+ value: false
+ weight: 11
+
+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/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
index 8160e1826..ba3c57901 100644
--- a/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_nfv-ovs_heat_ceilometer_scenario.yaml
@@ -76,7 +76,7 @@ dea-override-config:
attributes_1:
hugepages:
dpdk:
- value: 128
+ value: 1024
nova:
value:
'2048': 1024
diff --git a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index f8787d780..903aa57fb 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL-L2 No-HA deployment
- version: 0.0.3
- created: Jun 02 2016
- comment: Rebased to Fuel9
+ version: 0.0.4
+ created: Dec 07 2016
+ comment: Rebased to Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,7 +34,7 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.9.0
+ module-config-version: 1.0.0
module-config-override:
# Note that the module substitionion does not support arrays
# This is a quick fix
diff --git a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index 0c8415f78..3353d6744 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL-L3 No-HA deployment
- version: 0.0.4
- created: Jun 02 2016
- comment: Rebased to Fuel9
+ version: 0.0.5
+ created: Dec 07 2016
+ comment: Rebased to Fuel10
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -36,32 +36,14 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.9.0
+ module-config-version: 1.0.0
module-config-override:
metadata:
versions:
- enable_l3_odl:
value: true
metadata:
- plugin_version: 0.9.0
-
- - module: fuel-plugin-ovs
- module-config-name: fuel-nshovs
- module-config-version: 0.9.0
-
-# - module: opendaylight
-# module-config-name: fuel-odl
-# module-config-version: 0.0.2
-# module-config-override:
- # Module config overrides
-# rest_api_port:
-# value: '8282'
-# enable_gbp:
-# value: false
-# enable_l3_odl:
-# value: true
-# enable_sfc:
-# value: false
+ plugin_version: 1.0.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml
index 648ff22b3..a2fa19a4d 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -81,3 +81,9 @@ os-odl_l2-sfc-ha:
os-odl_l2-sfc-noha:
configfile: no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+
+os-nosdn-kvm_ovs_dpdk-ha:
+ configfile: ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml
+
+os-nosdn-kvm_ovs_dpdk-noha:
+ configfile: no-ha_nfv-kvm_nfv-ovs-dpdk_heat_ceilometer_scenario.yaml