Merge "Use tacker plugin in SFC scenario" into stable/colorado

3 files changed, 60 insertions, 6 deletions

diff --git a/deploy/config/plugins/fuel-tacker_0.9.0.yaml b/deploy/config/plugins/fuel-tacker_0.9.0.yaml
new file mode 100644
index 000000000..71e028ffd
--- /dev/null
+++ b/deploy/config/plugins/fuel-tacker_0.9.0.yaml
@@ -0,0 +1,48 @@
+##############################################################################
+# Copyright (c) 2015,2016 Ericsson AB and others.
+# mskalski@mirantis.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: Tacker fuel plugin configuration template
+  version: 0.1
+  created: 03.10.2016
+  comment: None
+tacker:
+  metadata:
+    #chosen_id: Assigned during installation
+    class: plugin
+    default: false
+    enabled: true
+    label: Tacker VNF manager
+    toggleable: true
+    versions:
+    - metadata:
+        group: 'openstack_services'
+        db_password:
+          generator: 'password'
+        user_password:
+          generator: 'password'
+        user: 'tacker'
+        port: 8889
+        service: 'tacker-server'
+        restrictions:
+          - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled == false or settings:opendaylight.enable_sfc.value == false"
+            strict: false
+            message: "Please install OpenDaylight Plugin with SFC features enabled"
+          - condition: "settings:fuel-plugin-ovs == null or settings:fuel-plugin-ovs.metadata.enabled == false"
+            strict: false
+            message: "Please install and enable Openvswitch plugin with NSH support."
+            #plugin_id: Assigned during installation
+            plugin_version: 0.2.0
+      debug:
+        value: false
+        label: 'Debug logging'
+        description: 'Debug logging mode provides more information, but requires more disk space.'
+        weight: 25
+        type: "checkbox"
+  weight: 70
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