aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-06-30 21:55:56 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-30 21:55:56 +0000
commitf27660f6b1fc7995e373a7aecfbe89d3735b02a9 (patch)
tree0ee1c489ecb316106cee09ffcd7887d65372cf36 /deploy
parent261046f7cc5dcf0ee7a9d1e4428b14f5227878c5 (diff)
parent484d866264c0023c33c3c7f3cb14e47d1cc11b78 (diff)
Merge "Use ODL Boron for SFC"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml129
-rw-r--r--deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml98
-rw-r--r--deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml131
-rw-r--r--deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml129
-rw-r--r--deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml131
5 files changed, 40 insertions, 578 deletions
diff --git a/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_odl-l2_heat_ceilometer_scenario.yaml
index 06b04af73..26a79031c 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.0.4
+ 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..e73842f82 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
@@ -34,8 +34,22 @@ deployment-scenario-metadata:
stack-extensions:
- module: nsh-ovs
module-config-name: fuel-nshovs
- module-config-version: 0.0.1
+ module-config-version: 0.0.2
module-config-override:
+ metadata:
+ versions:
+ install_nsh:
+ value: true
+ - module: opendaylight
+ module-config-name: fuel-odl
+ module-config-version: 0.0.4
+ module-config-override:
+ metadata:
+ versions:
+ enable_sfc:
+ value: true
+ package_name:
+ value: opendaylight-boron
# Note that the module substitionion does not support arrays
# This is a quick fix
# - module: opendaylight
@@ -77,86 +91,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..f5dd12c3a 100644
--- a/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l3_heat_ceilometer_scenario.yaml
@@ -34,6 +34,14 @@ 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.0.4
+ module-config-override:
+ metadata:
+ versions:
+ enable_l3_odl:
+ value: true
# - module: opendaylight
# module-config-name: fuel-odl
# module-config-version: 0.0.2
@@ -78,129 +86,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/no-ha_odl-l2_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l2_heat_ceilometer_scenario.yaml
index 02cc907a4..9e2922f78 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.0.4
+ 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-l3_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_odl-l3_heat_ceilometer_scenario.yaml
index 911654643..dbc222baf 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,14 @@ 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.0.4
+ module-config-override:
+ metadata:
+ versions:
+ enable_l3_odl:
+ value: true
# - module: opendaylight
# module-config-name: fuel-odl
# module-config-version: 0.0.2
@@ -74,129 +82,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: