From f9e50fa686599ff4a7e94805279820d3cdfefbc4 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 --- .../f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml | 6 --- .../f_bootstrap/post-scripts/00_post_example.sh | 10 +++++ .../f_bootstrap/post-scripts/03_install_repo.sh | 10 +++++ .../f_bootstrap/pre-scripts/00_pre_example.sh | 10 +++++ .../config/opendaylight_config.yaml | 52 ---------------------- build/f_isoroot/f_odlpluginbuild/packages.yaml | 8 ++++ .../f_onosfwpluginbuild/config/onosfw_config.yaml | 17 ------- .../config/ovs-nsh-dpdk-config.yaml | 6 --- .../config/ovsnfv-dpdk-config.yaml | 7 --- .../f_qemupluginbuild/config/qemu_config.yaml | 6 --- build/f_isoroot/f_repobuild/opnfv_mirror_conf.py | 9 +++- build/f_isoroot/f_repobuild/select_ubuntu_repo.sh | 9 +++- .../f_vsperfpluginbuild/config/qemu_config.yaml | 7 --- 13 files changed, 54 insertions(+), 103 deletions(-) delete mode 100644 build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml delete mode 100644 build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml delete mode 100644 build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml delete mode 100644 build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml delete mode 100644 build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml delete mode 100644 build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml delete mode 100644 build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml (limited to 'build/f_isoroot') diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml b/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml deleted file mode 100644 index 50870a179..000000000 --- a/build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -attributes: - metadata: - restrictions: - - "cluster:net_provider != 'neutron'": "Only neutron is supported by BGPVPN-plugin" - label: "BGPVPN plugin" - weight: 90 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh index 7ac896589..4dfeca58e 100755 --- a/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh @@ -1,4 +1,14 @@ #/bin/sh +############################################################################## +# 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 +############################################################################## + date echo "This is an example file run at post-bootstrap." exit 0 diff --git a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh index 8dad89397..be17e7e0a 100755 --- a/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh +++ b/build/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh @@ -1,4 +1,14 @@ #/bin/sh +############################################################################## +# 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 +############################################################################## + echo "Installing pre-build repo" if [ ! -d /opt/opnfv/nailgun ]; then echo "Error - found no repo!" diff --git a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh index ac427bf87..3eaffa523 100755 --- a/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh +++ b/build/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh @@ -1,4 +1,14 @@ #/bin/sh +############################################################################## +# 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 +############################################################################## + date echo "This is an example file run at pre-bootstrap." exit 0 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" diff --git a/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml b/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml deleted file mode 100644 index c6e60fd69..000000000 --- a/build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml +++ /dev/null @@ -1,17 +0,0 @@ -onos: - metadata: - enabled: true - label: onos plugin - plugin_id: 1 - restrictions: - - cluster:net_provider != 'neutron': Neutron only - toggleable: true - weight: 70 - public_eth: - description: Please note that onos needs an independent eth for public network - when interfaces of nodes are configured, or L3 traffic to internet will fail! - Defualt is eth3. - label: Public Ethernet Port - type: text - value: eth3 - weight: 20 diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml deleted file mode 100644 index 3943dbae4..000000000 --- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -attributes: - use_dpdk: - type: "checkbox" - weight: 20 - value: false - label: "Use dpdk" diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml deleted file mode 100644 index 947e22502..000000000 --- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml +++ /dev/null @@ -1,7 +0,0 @@ -attributes: - fuel-plugin-ovsnfv_text: - value: 'Set default value' - label: 'Text field' - description: 'Description for text field' - weight: 25 - type: "text" diff --git a/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml b/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml deleted file mode 100644 index 9e3b383d9..000000000 --- a/build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml +++ /dev/null @@ -1,6 +0,0 @@ -attributes: - metadata: - enabled: false - label: fuel-plugin-qemu - toggleable: true - weight: 70 diff --git a/build/f_isoroot/f_repobuild/opnfv_mirror_conf.py b/build/f_isoroot/f_repobuild/opnfv_mirror_conf.py index 9abd0242b..1c7eb591a 100755 --- a/build/f_isoroot/f_repobuild/opnfv_mirror_conf.py +++ b/build/f_isoroot/f_repobuild/opnfv_mirror_conf.py @@ -1,5 +1,12 @@ #!/usr/bin/env python - +############################################################################## +# 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 +############################################################################## import os import yaml diff --git a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh index 992359afd..bfaec74f1 100755 --- a/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh +++ b/build/f_isoroot/f_repobuild/select_ubuntu_repo.sh @@ -1,5 +1,12 @@ #!/bin/bash - +############################################################################## +# 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 +############################################################################## RSYNC="rsync -4 --contimeout 5 --no-motd --list-only" # try to choose close ubuntu mirror which support rsync protocol diff --git a/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml b/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml deleted file mode 100644 index 1dd28b54b..000000000 --- a/build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml +++ /dev/null @@ -1,7 +0,0 @@ -attributes: - fuel-plugin-vsperf_text: - value: 'Set default value' - label: 'Text field' - description: 'Description for text field' - weight: 25 - type: "text" -- cgit 1.2.3-korg