From 81ed415e34a11fc828d6af3c6b780029fa2edc47 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel 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 (cherry picked from commit f9e50fa686599ff4a7e94805279820d3cdfefbc4) --- deploy/config/dea_base.yaml | 13 +++++++++++-- .../default/fuel/config/dea-pod-override.yaml | 9 +++++++++ .../devel-pipeline/elx/fuel/config/dea-pod-override.yaml | 10 ++++++++++ .../huawei-ch/fuel/config/dea-pod-override.yaml | 9 +++++++++ deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml | 9 +++++++++ deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml | 9 +++++++++ deploy/config/plugins/fuel-nfvovs_0.0.1.yaml | 9 +++++++++ deploy/config/plugins/fuel-odl_0.0.1.yaml | 9 +++++++++ deploy/config/plugins/fuel-odl_0.0.2.yaml | 9 +++++++++ deploy/config/plugins/fuel-onos_0.0.1.yaml | 9 +++++++++ deploy/config/plugins/fuel-onos_0.0.2.yaml | 9 +++++++++ 11 files changed, 102 insertions(+), 2 deletions(-) (limited to 'deploy/config') diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 7c56e4bae..d040b782f 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -1,8 +1,17 @@ +############################################################################## +# 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 +############################################################################## + dea-base-config-metadata: title: 'Deployment Environment Adapter Base configuration' # DEA API version supported - version: '0.2' - created: 'Mon Jan 26 2016' + version: '0.3' + created: 'Tue Feb 2 2016' comment: 'Rebased for Fuel 8' environment: net_segment_type: tun diff --git a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml index eca91dfd8..60e0622b5 100644 --- a/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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 +############################################################################## + dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Default version' version: '0.3' diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml index fdbe202d3..8ede3d683 100644 --- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml @@ -1,3 +1,13 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@ericsson.com +# 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 +############################################################################## + dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Ericsson ELX version' version: '0.2' diff --git a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml index a76dce65f..5a109948e 100644 --- a/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml +++ b/deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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 +############################################################################## + dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for Development Pipeline - Huawei-China version' version: '0.2' diff --git a/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml b/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml index 05d351e11..94f17c126 100644 --- a/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml +++ b/deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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 diff --git a/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml b/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml index df59e551d..170424edb 100644 --- a/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml +++ b/deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: NFV QEMU-KVM fuel Plugin configuration template version: 0.1 diff --git a/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml b/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml index 02b6bf856..fdaba2a21 100644 --- a/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml +++ b/deploy/config/plugins/fuel-nfvovs_0.0.1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: NFV OVS fuel Plugin configuration template version: 0.1 diff --git a/deploy/config/plugins/fuel-odl_0.0.1.yaml b/deploy/config/plugins/fuel-odl_0.0.1.yaml index e1f743fbc..53c510557 100644 --- a/deploy/config/plugins/fuel-odl_0.0.1.yaml +++ b/deploy/config/plugins/fuel-odl_0.0.1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: OpenDaylight fuel Plugin configuration template version: 0.1 diff --git a/deploy/config/plugins/fuel-odl_0.0.2.yaml b/deploy/config/plugins/fuel-odl_0.0.2.yaml index a53e863c5..bd2ef5bb2 100644 --- a/deploy/config/plugins/fuel-odl_0.0.2.yaml +++ b/deploy/config/plugins/fuel-odl_0.0.2.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: OpenDaylight fuel Plugin configuration template version: 0.2 diff --git a/deploy/config/plugins/fuel-onos_0.0.1.yaml b/deploy/config/plugins/fuel-onos_0.0.1.yaml index 48dfd2fe3..54ecdc0dc 100644 --- a/deploy/config/plugins/fuel-onos_0.0.1.yaml +++ b/deploy/config/plugins/fuel-onos_0.0.1.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: ONOS fuel Plugin configuration template version: 0.1 diff --git a/deploy/config/plugins/fuel-onos_0.0.2.yaml b/deploy/config/plugins/fuel-onos_0.0.2.yaml index 66d26a129..1d0b54d04 100644 --- a/deploy/config/plugins/fuel-onos_0.0.2.yaml +++ b/deploy/config/plugins/fuel-onos_0.0.2.yaml @@ -1,3 +1,12 @@ +############################################################################## +# 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: ONOS fuel Plugin configuration template version: 0.2 -- cgit 1.2.3-korg