Merge "Update bgpvpn scenarios to version 1.0.0"

5 files changed, 37 insertions, 77 deletions

diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml
deleted file mode 100644
index 94f17c126..000000000
--- a/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 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
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-plugin-config-metadata:
-  title: BGPVPN fuel Plugin configuration template
-  version: 0.1
-  created: Wed Jan 13 2016
-  comment: None
-
-bgpvpn:
-  metadata:
-    enabled: true
-    restrictions:
-      - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin"
-    label: "BGPVPN plugin"
-    weight: 90
diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml
deleted file mode 100644
index f7ab89b37..000000000
--- a/deploy/config/plugins/fuel-bgpvpn_0.0.2.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 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
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-plugin-config-metadata:
-  title: BGPVPN fuel Plugin configuration template
-  version: 0.2
-  created: Fri Feb 05 2016
-  comment: None
-
-bgpvpn:
-  metadata:
-    class: plugin
-    default: false
-    enabled: false
-    label: BGPVPN plugin
-    toggleable: true
-    versions:
-    - metadata:
-        always_editable: false
-        enabled: true
-        label: BGPVPN plugin
-        plugin_version: 0.8.0
-        restrictions:
-        - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
-        weight: 90
-    weight: 70
diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml b/deploy/config/plugins/fuel-bgpvpn_1.0.0.yaml
index aeea9e450..70ae3ea3b 100644
--- a/deploy/config/plugins/fuel-bgpvpn_0.0.3.yaml
+++ b/deploy/config/plugins/fuel-bgpvpn_1.0.0.yaml
@@ -8,8 +8,8 @@
 ##############################################################################
 plugin-config-metadata:
   title: BGPVPN fuel Plugin configuration template
-  version: 0.3
-  created: 08-Mar-16
+  version: 1.0.0
+  created: 01.02.2017
   comment: None
 
 bgpvpn:
@@ -23,8 +23,11 @@ bgpvpn:
     - metadata:
         always_editable: false
         label: BGPVPN plugin
-        plugin_version: 0.8.0
+        plugin_version: 1.0.0
         restrictions:
-        - cluster:net_provider != 'neutron': Only neutron is supported by BGPVPN-plugin
+          - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin"
+          - condition: "settings:opendaylight == null or settings:opendaylight.metadata.enabled != true"
+            strict: false
+            message: "OpenDaylight plugin must be installed and enabled"
         weight: 90
     weight: 70
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: