diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-02 10:56:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-02 10:56:05 +0000 |
| commit | d9fc4611638648a54250773a21ab89646911f317 (patch) | |
| tree | 9540a82eb3956ef73e567a468f2b5c5c49aef33e /deploy/scenario | |
| parent | ed5004b24e4e4be4f9886c9e1fc7e3eda08260c9 (diff) | |
| parent | f7256dc3fd1b48d1e53a5321f44b9ce489d914de (diff) | |
Merge "Update bgpvpn scenarios to version 1.0.0"
Diffstat (limited to 'deploy/scenario')
| -rw-r--r-- | deploy/scenario/ha_odl-bgpvpn_scenario.yaml | 25 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml | 25 |
2 files changed, 30 insertions, 20 deletions
diff --git a/deploy/scenario/ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/ha_odl-bgpvpn_scenario.yaml index 7d52e77e2..fd30cf2ec 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.9.0 + version: 1.0.0 created: 29.06.2016 - comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9 + comment: Fuel ODL HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel10 ############################################################################## # 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.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - - enable_bgpvpn: + - enable_l3_odl: + value: true + deb_version: + value: '5.2.0-1' + enable_bgpvpn: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: bgpvpn module-config-name: fuel-bgpvpn - module-config-version: 0.9.0 - - - module: fuel-plugin-ovs - module-config-name: fuel-nshovs - module-config-version: 0.9.0 + module-config-version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary @@ -71,6 +71,11 @@ dea-override-config: - id: 5 interfaces: interfaces_1 role: ceph-osd,compute + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true dha-override-config: diff --git a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml index 6f21ea2c8..bc2dab5b9 100644 --- a/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml +++ b/deploy/scenario/no-ha_odl-bgpvpn_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL HA BGPVPN deployment - version: 0.9.0 + version: 1.0.0 created: 29.06.2016 - comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel9 + comment: Fuel ODL No HA with BGPVPN, Ceph, Ceilometer and Heat Rebased for Fuel10 ############################################################################## # 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.9.0 + module-config-version: 1.0.0 module-config-override: metadata: versions: - - enable_bgpvpn: + - enable_l3_odl: + value: true + deb_version: + value: '5.2.0-1' + enable_bgpvpn: value: true metadata: - plugin_version: 0.9.0 + plugin_version: 1.0.0 - module: bgpvpn module-config-name: fuel-bgpvpn - module-config-version: 0.9.0 - - - module: fuel-plugin-ovs - module-config-name: fuel-nshovs - module-config-version: 0.9.0 + module-config-version: 1.0.0 ############################################################################## # By editing the override-config sections below, you can override arbitrary @@ -69,6 +69,11 @@ dea-override-config: - id: 4 interfaces: interfaces_1 role: ceph-osd,compute + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true dha-override-config: # disks: |