diff options
| author |   Michal Skalski <mskalski@mirantis.com> | 2016-10-11 14:39:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-11 14:39:38 +0000 |
| commit | 5f8f0a9a6a598b20a54852b86d9e861b00376ad1 (patch) | |
| tree | 47de48614762b6657ff73b32e339e321ac9c5201 /deploy/scenario | |
| parent | 7f50323da4259c5e27f8dae72b5f02dababb7a99 (diff) | |
| parent | 356f2011adad574bde960a20cea2156373b2d108 (diff) | |
Merge "Use tacker plugin in SFC scenario" into stable/colorado
Diffstat (limited to 'deploy/scenario')
| -rw-r--r-- | deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 9 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_odl-l2_sfc_heat_ceilometer_scenario.yaml | 9 |
2 files changed, 12 insertions, 6 deletions
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 e6aef2aba..c4789484c 100644 --- a/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_odl-l2_sfc_heat_ceilometer_scenario.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# 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 @@ -22,7 +22,7 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2 SFC HA deployment - version: 0.0.1 + version: 0.0.2 created: Feb 10 2016 comment: Rebased to Fuel9 @@ -52,6 +52,9 @@ stack-extensions: value: true metadata: plugin_version: 0.9.0 + - module: tacker + module-config-name: fuel-tacker + module-config-version: 0.9.0 # Note that the module substitionion does not support arrays # This is a quick fix # - module: opendaylight @@ -78,7 +81,7 @@ dea-override-config: role: controller,opendaylight - id: 2 interfaces: interfaces_1 - role: mongo,controller + role: mongo,controller,tacker - id: 3 interfaces: interfaces_1 role: ceph-osd,controller 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 a8d9ed848..90a45d577 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 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2015 Ericsson AB and others. +# 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 @@ -22,7 +22,7 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ODL-L2-SFC No-HA deployment - version: 0.0.2 + version: 0.0.3 created: Feb 10 2016 comment: Fuel ODL-L2 SFC No HA with Ceph, Ceilometer and Heat Rebased for Fuel9 @@ -52,6 +52,9 @@ stack-extensions: value: true metadata: plugin_version: 0.9.0 + - module: tacker + module-config-name: fuel-tacker + module-config-version: 0.9.0 # Note that the module substitionion does not support arrays # This is a quick fix @@ -76,7 +79,7 @@ dea-override-config: nodes: - id: 1 interfaces: interfaces_1 - role: mongo,controller + role: mongo,controller,tacker - id: 2 interfaces: interfaces_1 role: ceph-osd,opendaylight |