From 81ed415e34a11fc828d6af3c6b780029fa2edc47 Mon Sep 17 00:00:00 2001
From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Tue, 2 Feb 2016 23:52:10 +0100
Subject: Correcting license and copyright terms throughout the repo

Please review this carefully!

Strategy:
1) No strict research on copyright/who did what (if you want it changed
   contact the Fuel team or Jonas Bjurel)
2) Licence statements will not be added to the following file types:
   - Patch files or orig files for patches
   - Config files generated by ordinary tools, like libvirt/visrsh
   - GIT dierctive file
   - Other auto-generated files

Change-Id: I48504c6f27925445dc44683a27a575bcab78d828
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
(cherry picked from commit f9e50fa686599ff4a7e94805279820d3cdfefbc4)
---
 .../config/opendaylight_config.yaml                | 52 ----------------------
 build/f_isoroot/f_odlpluginbuild/packages.yaml     |  8 ++++
 2 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml

(limited to 'build/f_isoroot/f_odlpluginbuild')

diff --git a/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml b/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml
deleted file mode 100644
index 183ef9ca9..000000000
--- a/build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-opendaylight:
-  metadata:
-    enabled: true
-    label: OpenDaylight plugin
-    plugin_id: 1
-    restrictions:
-    - cluster:net_provider != 'neutron': Only neutron is supported by OpenDaylight
-    toggleable: true
-    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
-  use_vxlan:
-    description: Configure neutron to use VXLAN tunneling
-    label: Use vxlan
-    restrictions:
-    - action: disable
-      condition: networking_parameters:segmentation_type == 'vlan'
-      message: Neutron with GRE segmentation required
-    type: checkbox
-    value: true
-    weight: 20
-  vni_range_end:
-    description: VXLAN VNI IDs range end
-    label: VNI range end
-    regex:
-      error: Invalid ID number
-      source: ^\d+$
-    restrictions:
-    - action: hide
-      condition: networking_parameters:segmentation_type == 'vlan'
-    type: text
-    value: '10000'
-    weight: 31
-  vni_range_start:
-    description: VXLAN VNI IDs range start
-    label: VNI range start
-    regex:
-      error: Invalid ID number
-      source: ^\d+$
-    restrictions:
-    - action: hide
-      condition: networking_parameters:segmentation_type == 'vlan'
-    type: text
-    value: '10'
-    weight: 30
diff --git a/build/f_isoroot/f_odlpluginbuild/packages.yaml b/build/f_isoroot/f_odlpluginbuild/packages.yaml
index 7ef537f31..f4036fd56 100644
--- a/build/f_isoroot/f_odlpluginbuild/packages.yaml
+++ b/build/f_isoroot/f_odlpluginbuild/packages.yaml
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2015 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
+##############################################################################
 packages:
   - "openjdk-7-jre-headless"
   - "acct"
-- 
cgit 1.2.3-korg