From 3778f82dfe7afe258a9584f72f82ac2ee6e8d92b Mon Sep 17 00:00:00 2001
From: Michal Skalski <mskalski@mirantis.com>
Date: Tue, 19 Jan 2016 11:00:23 +0100
Subject: OpenDaylight plugin for brahmaputra release

Include new version of fuel-plugin-opendaylight.
Changes in this version:

 - Support MOS 8.0.
 - Move ODL installation and configuration
   to main phase of deployment.
 - L3 traffic managed by ODL possible when vxlan
   tunneling is used.
 - Include snapshot of OpenDaylight Beryllium,
   stable version not available at this moment.
 - Get rid of hardcoded configuration related to specific ODL version.
   Now plugin is more elastic and should support a broader
   number of ODL versions.
 - odl_network_scheme function overrided standard network scheme
   so custom network templates are not required.
 - ODL is no longer patched to use br-floating bridge

JIRA: FUEL-58

Change-Id: Ie3542e285a064c37d1edb6751c4853a5e7594478
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
---
 build/f_isoroot/f_odlpluginbuild/Makefile |   2 +-
 deploy/config/plugins/fuel-odl_0.0.1.yaml | 124 +++++++++++++++++-------------
 2 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
index ba5a06b0e..18fbb9e60 100644
--- a/build/f_isoroot/f_odlpluginbuild/Makefile
+++ b/build/f_isoroot/f_odlpluginbuild/Makefile
@@ -8,7 +8,7 @@
 ##############################################################################
 
 TOP := $(shell pwd)
-ODL_BRANCH=7.0
+ODL_BRANCH=brahmaputra-release
 ODL_REPO="https://github.com/openstack/fuel-plugin-opendaylight.git"
 
 .PHONY: all
diff --git a/deploy/config/plugins/fuel-odl_0.0.1.yaml b/deploy/config/plugins/fuel-odl_0.0.1.yaml
index 11622a16c..e1f743fbc 100644
--- a/deploy/config/plugins/fuel-odl_0.0.1.yaml
+++ b/deploy/config/plugins/fuel-odl_0.0.1.yaml
@@ -5,60 +5,78 @@ plugin-config-metadata:
   comment: None
 
 opendaylight:
-  enable_gbp:
-    label: GBP features
-    type: checkbox
-    value: false
-    weight: 14
-  enable_l3_odl:
-    label: 'EXPERIMENTAL: Use ODL to manage L3 traffic'
-    type: checkbox
-    value: false
-    weight: 12
-  enable_sfc:
-    label: SFC features
-    type: checkbox
-    value: false
-    weight: 13
   metadata:
+    # chosen_id: Assigned during installation
+    class: plugin
+    default: false
     enabled: true
-    label: OpenDaylight Lithium plugin
-    odl_features:
-      default:
-      - config
-      - standard
-      - region
-      - package
-      - kar
-      - ssh
-      - management
-      gbp:
-      - odl-groupbasedpolicy-base
-      - odl-groupbasedpolicy-ofoverlay
-      ovs:
-      - odl-ovsdb-openstack
-      - odl-restconf-all
-      - odl-aaa-authn
-      - odl-dlux-all
-      sfc:
-      - odl-sfc-core
-      - odl-sfc-sb-rest
-      - odl-sfc-ui
-      - odl-sfc-netconf
-      - odl-sfc-ovs
-      - odl-sfcofl2
-      - odl-sfc-test-consumer
-      # plugin_id: Assigned during installation
-    restrictions:
-    - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
+    label: OpenDaylight plugin
     toggleable: true
+    versions:
+    - enable_gbp:
+        label: GBP features
+        type: checkbox
+        value: false
+        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: true
+        weight: 12
+      enable_sfc:
+        label: SFC features
+        type: checkbox
+        value: false
+        weight: 13
+      metadata:
+        always_editable: false
+        odl_features:
+          default:
+          - config
+          - standard
+          - region
+          - package
+          - kar
+          - ssh
+          - management
+          gbp:
+          - odl-groupbasedpolicy-base
+          - odl-groupbasedpolicy-ofoverlay
+          ovs:
+          - odl-ovsdb-openstack
+          - odl-restconf-all
+          - odl-aaa-authn
+          - odl-dlux-all
+          sfc:
+          - odl-sfc-core
+          - odl-sfc-sb-rest
+          - odl-sfc-ui
+          - odl-sfc-netconf
+          - odl-sfc-ovs
+          - odl-sfcofl2
+          - odl-sfc-test-consumer
+          vpn:
+          - odl-vpnservice-api
+          - odl-vpnservice-impl
+          - odl-vpnservice-impl-rest
+          - odl-vpnservice-impl-ui
+          - odl-vpnservice-core
+        # 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
-  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
-- 
cgit 1.2.3-korg