summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-08-12 14:20:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-12 14:20:36 +0000
commit1268d78a2564bcadb02226103aec3d4f01eb1fb0 (patch)
treed50a81c90b0bd6916ade23d8ca344d13c683ff14
parent3d768dda2bb803adb1536a0247adc1729478879a (diff)
parentfa28f15fda4207bfb546c34cc0bed83423fcc42f (diff)
Merge "Allign odl-sfc scenarios with new plugin version"
-rw-r--r--build/f_isoroot/f_odlpluginbuild/config.mk2
-rw-r--r--deploy/config/plugins/fuel-odl_0.9.0.yaml26
-rw-r--r--deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml2
-rw-r--r--deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml100
4 files changed, 24 insertions, 106 deletions
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index d0738257b..2de18fba7 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,7 +8,7 @@
##############################################################################
ODL_BRANCH ?= master
-ODL_CHANGE ?= 5d80efce6d0b1d242489ec2897cf20f51dd5fcb1
+ODL_CHANGE ?= b6aeb90c156d77bd3e100106d8501a50f756cacd
ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
export ODL_TARBALL_LOCATION?=https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz
diff --git a/deploy/config/plugins/fuel-odl_0.9.0.yaml b/deploy/config/plugins/fuel-odl_0.9.0.yaml
index 90a64949c..6caf4834f 100644
--- a/deploy/config/plugins/fuel-odl_0.9.0.yaml
+++ b/deploy/config/plugins/fuel-odl_0.9.0.yaml
@@ -83,23 +83,6 @@ opendaylight:
- 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
@@ -130,13 +113,14 @@ opendaylight:
- 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
+ - odl-sfc-openflow-renderer
vpn:
- odl-vpnservice-openstack
+ odl_deb: opendaylight
+ experimental_odl_deb: opendaylight-boron
+ use_experimental_odl:
+ - enable_sfc
#plugin_id: Assigned during installation
plugin_version: 0.9.0
restrictions:
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 1fb451721..a900720f9 100644
--- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml
@@ -50,8 +50,6 @@ stack-extensions:
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
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 bf72ad7e5..58fdd07b8 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
@@ -22,9 +22,9 @@
# deployment configuration meta-data
deployment-scenario-metadata:
title: ODL-L2-SFC No-HA deployment
- version: 0.0.1
+ version: 0.0.2
created: Feb 10 2016
- comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel8
+ comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel9
##############################################################################
# Stack extentions are opnfv added value features in form of a fuel-plugin
@@ -36,6 +36,22 @@ stack-extensions:
module-config-name: fuel-nshovs
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
+ metadata:
+ plugin_version: 0.9.0
# Note that the module substitionion does not support arrays
# This is a quick fix
@@ -57,7 +73,6 @@ stack-extensions:
# By editing the override-config sections below, you can override arbitrary
# configuration name-space settings
dea-override-config:
-
nodes:
- id: 1
interfaces: interfaces_1
@@ -75,85 +90,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:
# disks: