aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml22
-rw-r--r--deploy/config/plugins/fuel-nshovs_0.9.0.yaml37
-rw-r--r--deploy/config/plugins/fuel-odl_0.9.0.yaml159
-rw-r--r--deploy/dha_adapters/zte_adapter.py4
-rw-r--r--deploy/scenario/ha_odl-bgpvpn_scenario.yaml14
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml129
-rw-r--r--deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml104
-rw-r--r--deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml133
-rw-r--r--deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml120
-rw-r--r--deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml16
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml129
-rw-r--r--deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml4
-rw-r--r--deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml133
-rw-r--r--deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml97
-rw-r--r--deploy/scenario/scenario.yaml6
-rw-r--r--deploy/ssh_client.py9
16 files changed, 516 insertions, 600 deletions
diff --git a/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
new file mode 100644
index 000000000..bbdefaf6e
--- /dev/null
+++ b/deploy/config/plugins/fuel-bgpvpn_0.9.0.yaml
@@ -0,0 +1,22 @@
+plugin-config-metadata:
+ title: BGPVPN fuel Plugin configuration template
+ version: 0.9.0
+ created: 29.06.2016
+ comment: None
+
+bgpvpn:
+ metadata:
+ class: plugin
+ default: false
+ enabled: true
+ label: BGPVPN plugin
+ toggleable: true
+ versions:
+ - metadata:
+ always_editable: false
+ label: BGPVPN plugin
+ plugin_version: 0.9.0
+ restrictions:
+ - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
+ weight: 90
+ weight: 70
diff --git a/deploy/config/plugins/fuel-nshovs_0.9.0.yaml b/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
new file mode 100644
index 000000000..b5caae039
--- /dev/null
+++ b/deploy/config/plugins/fuel-nshovs_0.9.0.yaml
@@ -0,0 +1,37 @@
+##############################################################################
+# 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: NSHOVS fuel Plugin configuration template
+ version: 0.2
+ created: Jun 30 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: 0.9.0
+ weight: 70
diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml
new file mode 100644
index 000000000..90a64949c
--- /dev/null
+++ b/deploy/config/plugins/fuel-odl_0.9.0.yaml
@@ -0,0 +1,159 @@
+##############################################################################
+# 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.4
+ created: 30.06.2016
+ comment: Add new field for boron version
+opendaylight:
+ metadata:
+ #chosen_id: Assigned during installation
+ class: plugin
+ default: false
+ enabled: true
+ label: OpenDaylight plugin
+ toggleable: true
+ versions:
+ - bgpvpn_gateway:
+ description: Define the default gateway for BGPVPN
+ label: Default Gateway
+ regex:
+ error: Invalid ip number
+ 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]?)$
+ restrictions:
+ - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
+ is enabled.
+ type: text
+ value: 0.0.0.0
+ weight: 50
+ enable_bgpvpn:
+ 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.
+
+ '
+ label: BGPVPN extensions
+ restrictions:
+ - condition: settings:bgpvpn == null or settings:bgpvpn.metadata.enabled
+ == false
+ message: BGPVPN (fuel-plugin-bgpvpn) plugin must be installed and enabled.
+ strict: false
+ - networking_parameters:segmentation_type == 'vlan': This feature works
+ only with segmentation_type != vlan
+ type: checkbox
+ value: false
+ weight: 40
+ 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: 10
+ enable_sfc:
+ label: SFC features
+ type: checkbox
+ value: false
+ weight: 20
+ sfc_class:
+ 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.
+
+ '
+ label: Classifier used by SFC
+ restrictions:
+ - action: hide
+ condition: settings:opendaylight.enable_sfc.value == false
+ type: select
+ value: ncr
+ values:
+ - data: ncr
+ label: NetVirt
+ - data: gcr
+ label: GBP
+ weight: 21
+ package_name:
+ description: 'Plugin can be build with dedicated package for SFC. Before
+ choosing opendaylight-boron ensure that plugin include this package.
+
+ '
+ label: Name of opendaylight deb package
+ restrictions:
+ - action: hide
+ condition: settings:opendaylight.enable_sfc.value == false
+ type: select
+ value: opendaylight
+ values:
+ - data: opendaylight
+ label: opendaylight
+ - data: opendaylight-boron
+ label: opendaylight-boron
+ weight: 22
+ metadata:
+ default_credentials:
+ password: admin
+ user: admin
+ hot_pluggable: false
+ jetty_port: 8181
+ odl_features:
+ default:
+ - config
+ - standard
+ - region
+ - package
+ - kar
+ - ssh
+ - management
+ gcr:
+ - odl-groupbasedpolicy-ovssfc
+ ncr:
+ - odl-ovsdb-sfc
+ - odl-ovsdb-sfc-rest
+ odl-default:
+ - odl-restconf-all
+ - odl-aaa-authn
+ - odl-dlux-all
+ 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.9.0
+ restrictions:
+ - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+ odl_v2:
+ description: V2 version is considered as experimental
+ label: Use V2 ML2 driver
+ type: checkbox
+ value: true
+ weight: 60
+ 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: 70
+ weight: 70
diff --git a/deploy/dha_adapters/zte_adapter.py b/deploy/dha_adapters/zte_adapter.py
index 1e610ca41..a40a02685 100644
--- a/deploy/dha_adapters/zte_adapter.py
+++ b/deploy/dha_adapters/zte_adapter.py
@@ -20,8 +20,8 @@ from common import (
class ZteAdapter(IpmiAdapter):
- def __init__(self, yaml_path):
- super(ZteAdapter, self).__init__(yaml_path)
+ def __init__(self, yaml_path, attempts=100):
+ super(ZteAdapter, self).__init__(yaml_path, attempts)
def node_reset(self, node_id):
WAIT_LOOP = 600
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
index c0343a617..2257cbb70 100644
--- a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL HA BGPVPN deployment
- version: 0.0.1
- created: 04.03.2016
- comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8
+ version: 0.9.0
+ created: 29.06.2016
+ comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,22 +34,22 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.0.3
+ module-config-version: 0.9.0
module-config-override:
metadata:
versions:
- enable_bgpvpn:
value: true
metadata:
- plugin_version: 0.8.1
+ plugin_version: 0.9.0
- module: bgpvpn
module-config-name: fuel-bgpvpn
- module-config-version: 0.0.3
+ module-config-version: 0.9.0
- module: fuel-plugin-ovs
module-config-name: fuel-nshovs
- module-config-version: 0.0.1
+ module-config-version: 0.9.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 06b04af73..0d16a3d65 100644
--- a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -32,6 +32,10 @@ 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: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.9.0
+ module-config-override:
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
@@ -73,131 +77,6 @@ dea-override-config:
interfaces: interfaces_1
role: ceph-osd,compute
transformations: transformations_1
- settings:
- editable:
- opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - bgpvpn_gateway:
- description: Define the default gateway for BGPVPN
- label: Default Gateway
- regex:
- error: Invalid ip number
- 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]?)$
- restrictions:
- - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
- is enabled.
- type: text
- value: 0.0.0.0
- weight: 16
- enable_bgpvpn:
- 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.
-
- '
- label: BGPVPN extensions
- type: checkbox
- value: false
- weight: 15
- 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:
- default_credentials:
- password: admin
- user: admin
- hot_pluggable: false
- jetty_port: 8181
- odl_features:
- cluster:
- - odl-jolokia
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gcr:
- - odl-groupbasedpolicy-ovssfc
- ncr:
- - odl-ovsdb-sfc
- - odl-ovsdb-sfc-rest
- odl-default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- 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.9.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- odl_v2:
- description: V2 version is considered as experimental
- label: Use V2 ML2 driver
- type: checkbox
- value: false
- weight: 17
- 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
- sfc_class:
- 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.
-
- '
- label: Classifier used by SFC
- restrictions:
- - action: hide
- condition: settings:opendaylight.enable_sfc.value == false
- type: select
- value: ncr
- values:
- - data: ncr
- label: NetVirt
- - data: gcr
- label: GBP
- weight: 14
- weight: 70
dha-override-config:
nodes:
diff --git a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 70b91e71e..1fb451721 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -24,7 +24,7 @@ deployment-scenario-metadata:
title: ODL-L2 SFC HA deployment
version: 0.0.1
created: Feb 10 2016
- comment: Rebased to Fuel8
+ comment: Rebased to Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -32,10 +32,28 @@ 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: nsh-ovs
+ - module: fuel-plugin-ovs
module-config-name: fuel-nshovs
- module-config-version: 0.0.1
+ module-config-version: 0.9.0
module-config-override:
+ metadata:
+ versions:
+ - install_nsh:
+ value: true
+ metadata:
+ plugin_version: 0.9.0
+ - module: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.9.0
+ module-config-override:
+ metadata:
+ versions:
+ - enable_sfc:
+ value: true
+ package_name:
+ value: opendaylight-boron
+ metadata:
+ plugin_version: 0.9.0
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
@@ -77,86 +95,6 @@ dea-override-config:
interfaces: interfaces_1
role: ceph-osd,compute
transformations: transformations_1
- settings:
- editable:
- 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: true
- 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: true
- weight: 13
- metadata:
- always_editable: false
- odl_features:
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- - odl-restconf-all
- gbp:
- - odl-groupbasedpolicy-neutronmapper
- - odl-groupbasedpolicy-ofoverlay
- ovs:
- - odl-ovsdb-openstack
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- 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-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
-
dha-override-config:
nodes:
- id: 1
diff --git a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
index f8199e6e7..e222582d2 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -34,6 +34,16 @@ deployment-scenario-metadata:
# Note that the module substitionion does not support arrays
# This is a quick fix
stack-extensions:
+ - module: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.9.0
+ module-config-override:
+ metadata:
+ versions:
+ - enable_l3_odl:
+ value: true
+ metadata:
+ plugin_version: 0.9.0
# - module: opendaylight
# module-config-name: fuel-odl
# module-config-version: 0.0.2
@@ -78,129 +88,6 @@ dea-override-config:
public_network_assignment:
assign_to_all_nodes:
value: true
- opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - bgpvpn_gateway:
- description: Define the default gateway for BGPVPN
- label: Default Gateway
- regex:
- error: Invalid ip number
- 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]?)$
- restrictions:
- - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
- is enabled.
- type: text
- value: 0.0.0.0
- weight: 16
- enable_bgpvpn:
- 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.
-
- '
- label: BGPVPN extensions
- type: checkbox
- value: false
- weight: 15
- 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:
- default_credentials:
- password: admin
- user: admin
- hot_pluggable: false
- jetty_port: 8181
- odl_features:
- cluster:
- - odl-jolokia
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gcr:
- - odl-groupbasedpolicy-ovssfc
- ncr:
- - odl-ovsdb-sfc
- - odl-ovsdb-sfc-rest
- odl-default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- 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.9.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- odl_v2:
- description: V2 version is considered as experimental
- label: Use V2 ML2 driver
- type: checkbox
- value: true
- weight: 17
- 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
- sfc_class:
- 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.
-
- '
- label: Classifier used by SFC
- restrictions:
- - action: hide
- condition: settings:opendaylight.enable_sfc.value == false
- type: select
- value: ncr
- values:
- - data: ncr
- label: NetVirt
- - data: gcr
- label: GBP
- weight: 14
- weight: 70
dha-override-config:
nodes:
diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
new file mode 100644
index 000000000..cb46af569
--- /dev/null
+++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -0,0 +1,120 @@
+##############################################################################
+# 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: ONOS HA deployment
+ version: 0.0.6
+ created: Jun 08 2016
+ comment: Rebased to Fuel9
+
+##############################################################################
+# 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: onos
+ module-config-name: fuel-onos
+ module-config-version: 0.0.3
+ module-config-override:
+ metadata:
+ class: plugin
+ default: false
+ enabled: true
+ label: onos plugin
+ toggleable: true
+ versions:
+ - enable_sfc:
+ label: SFC features
+ type: checkbox
+ value: false
+ weight: 13
+ metadata:
+ hot_pluggable: false
+ plugin_version: 0.9.0
+ restrictions:
+ - cluster:net_provider != 'neutron': Neutron only
+ - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
+ public network to all nodes
+ weight: 70
+
+##############################################################################
+# 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,onos
+ 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
+ settings:
+ editable:
+ public_network_assignment:
+ assign_to_all_nodes:
+ value: true
+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_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
index 067da4761..333ff5af5 100644
--- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml
@@ -21,10 +21,10 @@
##############################################################################
# deployment configuration meta-data
deployment-scenario-metadata:
- title: ODL No-HA BGPVPN deployment
- version: 0.0.1
- created: 04.03.2016
- comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel8
+ title: ODL HA BGPVPN deployment
+ version: 0.9.0
+ created: 29.06.2016
+ comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -34,22 +34,22 @@ deployment-scenario-metadata:
stack-extensions:
- module: opendaylight
module-config-name: fuel-odl
- module-config-version: 0.0.3
+ module-config-version: 0.9.0
module-config-override:
metadata:
versions:
- enable_bgpvpn:
value: true
metadata:
- plugin_version: 0.8.1
+ plugin_version: 0.9.0
- module: bgpvpn
module-config-name: fuel-bgpvpn
- module-config-version: 0.0.3
+ module-config-version: 0.9.0
- module: fuel-plugin-ovs
module-config-name: fuel-nshovs
- module-config-version: 0.0.1
+ module-config-version: 0.9.0
##############################################################################
# By editing the override-config sections below, you can override arbitrary
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 02cc907a4..55af51f9e 100644
--- a/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
@@ -32,6 +32,10 @@ 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: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.9.0
+ module-config-override:
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
@@ -70,131 +74,6 @@ dea-override-config:
interfaces: interfaces_1
role: ceph-osd,compute
transformations: transformations_1
- settings:
- editable:
- opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - bgpvpn_gateway:
- description: Define the default gateway for BGPVPN
- label: Default Gateway
- regex:
- error: Invalid ip number
- 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]?)$
- restrictions:
- - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
- is enabled.
- type: text
- value: 0.0.0.0
- weight: 16
- enable_bgpvpn:
- 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.
-
- '
- label: BGPVPN extensions
- type: checkbox
- value: false
- weight: 15
- 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:
- default_credentials:
- password: admin
- user: admin
- hot_pluggable: false
- jetty_port: 8181
- odl_features:
- cluster:
- - odl-jolokia
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gcr:
- - odl-groupbasedpolicy-ovssfc
- ncr:
- - odl-ovsdb-sfc
- - odl-ovsdb-sfc-rest
- odl-default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- 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.9.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- odl_v2:
- description: V2 version is considered as experimental
- label: Use V2 ML2 driver
- type: checkbox
- value: false
- weight: 17
- 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
- sfc_class:
- 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.
-
- '
- label: Classifier used by SFC
- restrictions:
- - action: hide
- condition: settings:opendaylight.enable_sfc.value == false
- type: select
- value: ncr
- values:
- - data: ncr
- label: NetVirt
- - data: gcr
- label: GBP
- weight: 14
- weight: 70
dha-override-config:
# disks:
diff --git a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
index 028aa15dd..bf72ad7e5 100644
--- a/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -32,9 +32,9 @@ 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: nsh-ovs
+ - module: fuel-plugin-ovs
module-config-name: fuel-nshovs
- module-config-version: 0.0.1
+ module-config-version: 0.9.0
module-config-override:
# Note that the module substitionion does not support arrays
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 911654643..bb0e28db2 100644
--- a/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -34,6 +34,16 @@ deployment-scenario-metadata:
# Note that the module substitionion does not support arrays
# This is a quick fix
stack-extensions:
+ - module: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.9.0
+ module-config-override:
+ metadata:
+ versions:
+ - enable_l3_odl:
+ value: true
+ metadata:
+ plugin_version: 0.9.0
# - module: opendaylight
# module-config-name: fuel-odl
# module-config-version: 0.0.2
@@ -74,129 +84,6 @@ dea-override-config:
public_network_assignment:
assign_to_all_nodes:
value: true
- opendaylight:
- metadata:
- # chosen_id: Assigned during installation
- class: plugin
- default: false
- enabled: true
- label: OpenDaylight plugin
- toggleable: true
- versions:
- - bgpvpn_gateway:
- description: Define the default gateway for BGPVPN
- label: Default Gateway
- regex:
- error: Invalid ip number
- 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]?)$
- restrictions:
- - settings:opendaylight.enable_bgpvpn.value == false: Only needed if BGPVPN
- is enabled.
- type: text
- value: 0.0.0.0
- weight: 16
- enable_bgpvpn:
- 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.
-
- '
- label: BGPVPN extensions
- type: checkbox
- value: false
- weight: 15
- 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:
- default_credentials:
- password: admin
- user: admin
- hot_pluggable: false
- jetty_port: 8181
- odl_features:
- cluster:
- - odl-jolokia
- default:
- - config
- - standard
- - region
- - package
- - kar
- - ssh
- - management
- gcr:
- - odl-groupbasedpolicy-ovssfc
- ncr:
- - odl-ovsdb-sfc
- - odl-ovsdb-sfc-rest
- odl-default:
- - odl-restconf-all
- - odl-aaa-authn
- - odl-dlux-all
- 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.9.0
- restrictions:
- - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
- odl_v2:
- description: V2 version is considered as experimental
- label: Use V2 ML2 driver
- type: checkbox
- value: true
- weight: 17
- 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
- sfc_class:
- 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.
-
- '
- label: Classifier used by SFC
- restrictions:
- - action: hide
- condition: settings:opendaylight.enable_sfc.value == false
- type: select
- value: ncr
- values:
- - data: ncr
- label: NetVirt
- - data: gcr
- label: GBP
- weight: 14
- weight: 70
dha-override-config:
# disks:
diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
new file mode 100644
index 000000000..c6f07a73c
--- /dev/null
+++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -0,0 +1,97 @@
+##############################################################################
+# 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: ONOS No-HA deployment
+ version: 0.0.5
+ created: Jun 08 2016
+ comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel9
+
+##############################################################################
+# 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: onos
+ module-config-name: fuel-onos
+ module-config-version: 0.0.3
+ module-config-override:
+ metadata:
+ class: plugin
+ default: false
+ enabled: true
+ label: onos plugin
+ toggleable: true
+ versions:
+ - enable_sfc:
+ label: SFC features
+ type: checkbox
+ value: false
+ weight: 13
+ metadata:
+ hot_pluggable: false
+ plugin_version: 0.9.0
+ restrictions:
+ - cluster:net_provider != 'neutron': Neutron only
+ - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
+ public network to all nodes
+ weight: 70
+
+##############################################################################
+# By editing the override-config sections below, you can override arbitrary
+# configuration name-space settings
+dea-override-config:
+ environment:
+ net_segment_type: tun
+ name: onos_no-ha
+ nodes:
+ - id: 1
+ interfaces: interfaces_1
+ role: mongo,controller,onos
+ 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
+ settings:
+ editable:
+ public_network_assignment:
+ assign_to_all_nodes:
+ value: true
+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 fe1660616..648ff22b3 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -46,6 +46,12 @@ os-odl_l2-nofeature-ha:
os-odl_l2-nofeature-noha:
configfile: no-ha_odl-l2_heat_ceilometer_scenario.yaml
+os-onos-nofeature-ha:
+ configfile: ha_onos_nofeature_heat_ceilometer_scenario.yaml
+
+os-onos-nofeature-noha:
+ configfile: no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+
os-onos-sfc-ha:
configfile: ha_onos_sfc_heat_ceilometer_scenario.yaml
diff --git a/deploy/ssh_client.py b/deploy/ssh_client.py
index f6888d52d..24119dbfa 100644
--- a/deploy/ssh_client.py
+++ b/deploy/ssh_client.py
@@ -1,6 +1,7 @@
###############################################################################
# Copyright (c) 2015 Ericsson AB and others.
# szilard.cserey@ericsson.com
+# peter.barabas@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
@@ -85,14 +86,18 @@ class SSHClient(object):
def scp_get(self, remote, local='.', dir=False):
try:
- with scp.SCPClient(self.client.get_transport(), sanitize=lambda x: x) as _scp:
+ with scp.SCPClient(self.client.get_transport(),
+ sanitize=lambda x: x,
+ socket_timeout=TIMEOUT) as _scp:
_scp.get(remote, local, dir)
except Exception as e:
err(e)
def scp_put(self, local, remote='.', dir=False):
try:
- with scp.SCPClient(self.client.get_transport(), sanitize=lambda x: x) as _scp:
+ with scp.SCPClient(self.client.get_transport(),
+ sanitize=lambda x: x,
+ socket_timeout=TIMEOUT) as _scp:
_scp.put(local, remote, dir)
except Exception as e:
err(e)