diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-02-02 23:52:10 +0100 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2016-02-04 12:15:25 +0000 |
commit | 81ed415e34a11fc828d6af3c6b780029fa2edc47 (patch) | |
tree | e641cf2a65a65851156abdce02bdee5ceccd6317 /build | |
parent | 5e2b5def613bc16d7eb2561e765b33f1fada0d2b (diff) |
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)
Diffstat (limited to 'build')
24 files changed, 63 insertions, 239 deletions
diff --git a/build/docker/ubuntu-builder/install_docker.sh b/build/docker/ubuntu-builder/install_docker.sh index eeb80e36a..47c3a52ec 100755 --- a/build/docker/ubuntu-builder/install_docker.sh +++ b/build/docker/ubuntu-builder/install_docker.sh @@ -1,4 +1,13 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# stefan.k.berg@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 +############################################################################## + # From prepare-build-env.sh of Fuel # Check if docker is installed if hash docker 2>/dev/null; then diff --git a/build/f_example_packadd/Makefile b/build/f_example_packadd/Makefile deleted file mode 100644 index a64293dcb..000000000 --- a/build/f_example_packadd/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -TOP := $(shell pwd) -PACKAGE := foobar -VERSION := 1.0-1 -DEB_NAME := $(PACKAGE)_$(VERSION).deb - -.PHONY: all -all: release/pool/main/$(DEB_NAME) - -release/pool/main/$(DEB_NAME): - @mkdir -p tmp/src - @mkdir -p release/pool/main - @cp -r $(DEB_NAME) tmp/src - @gzip -9 tmp/src/$(DEB_NAME)/usr/share/doc/$(PACKAGE)/changelog.Debian - @fakeroot dpkg-deb --build tmp/src/$(DEB_NAME) - @lintian tmp/src/$(DEB_NAME) - @cp tmp/src/$(DEB_NAME) release/pool/main - -.PHONY: clean -clean: - @rm -rf tmp - @rm -rf release - @rm -f ../release/packages/ubuntu/pool/main/$(DEB_NAME) - -.PHONY: validate-cache -validate-cache: - @echo "No cache validation schema available for $(shell pwd)" - @echo "Continuing ..." - -.PHONY: release -release:release/pool/main/$(DEB_NAME) - @cp release/pool/main/$(DEB_NAME) $(DEB_DEST) - @cp -Rvp puppet/modules/* $(PUPPET_DEST) diff --git a/build/f_example_packadd/README b/build/f_example_packadd/README deleted file mode 100644 index 55fa7c1a1..000000000 --- a/build/f_example_packadd/README +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -This is an example of a an addition of an arbitrary debian package: foobar -It adds the debian package foobar_1.0-1 to the fuel .iso image and deploys it -to the controllers and the computes. - -The f_example_packadd has the following structure: -. -+--------+----------+-----------+------------+ - | | | | - puppet/ Makefile README foobar_1.0-1/ - | (this file) (deb pack) - | - | - modules/ - | - | - | - opnfv/ - | - | - | - manifests/ - | - | - | - foobar.pp - -Makefile: -Invoked by the git root Makefile, based on the foobar_1.0-1 deb pack artifacts, and the pupet manifests, it builds a deb package -and adds it together with the manifest to a fuel build artifact directory, such that it eventually gets built into the new fuel .iso - -foobar_1.0-1: -Contains arbitrary debian package artifacts - -foobar.pp: -Controls the installation and configuration of foobar - -To activate this example feature, add "SUBDIRS += f_example_packadd" in the git root Makefile. diff --git a/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles b/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles deleted file mode 100644 index bad6a0ef5..000000000 --- a/build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/foobar/foobar.conf diff --git a/build/f_example_packadd/foobar_1.0-1/DEBIAN/control b/build/f_example_packadd/foobar_1.0-1/DEBIAN/control deleted file mode 100644 index f3f0eb603..000000000 --- a/build/f_example_packadd/foobar_1.0-1/DEBIAN/control +++ /dev/null @@ -1,10 +0,0 @@ -Package: foobar -Version: 1.0-1 -Section: utils -Priority: optional -Architecture: amd64 -Depends: python2.7 -Maintainer: Main Tainer <maintainer@somwhere.org> -Description: foo bar daemon - This is a daemon for the Foobar service. - Foo is bar! diff --git a/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst b/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst deleted file mode 100755 index f48f26075..000000000 --- a/build/f_example_packadd/foobar_1.0-1/DEBIAN/postinst +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -e -date diff --git a/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf b/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf deleted file mode 100644 index e0eee5c7a..000000000 --- a/build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Foobar config file -foo=bar diff --git a/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar b/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar deleted file mode 100755 index c9651a463..000000000 --- a/build/f_example_packadd/foobar_1.0-1/usr/bin/foobar +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -echo Hello from the foobar package diff --git a/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian deleted file mode 100644 index fe776f33e..000000000 --- a/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian +++ /dev/null @@ -1,5 +0,0 @@ -foobar (1.0-1) precise-proposed; urgency=low - - * Genesis - - -- Main Tainer <maintainer@somewhere.org> Tue, 23 Sep 2014 11:13:27 +0200 diff --git a/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright b/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright deleted file mode 100644 index 4279ce4e2..000000000 --- a/build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright +++ /dev/null @@ -1,18 +0,0 @@ -foobar - a test daemon -Copyright (C) 2014 Main Tainer - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License with -your Debian GNU system, in /usr/share/common-licenses/GPL, or with the -Debian GNU gnupg source package as the file COPYING. If not, see -<http://www.gnu.org/licenses/> or write to the Free Software Foundation, -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp b/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp deleted file mode 100644 index c6219baa8..000000000 --- a/build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp +++ /dev/null @@ -1,7 +0,0 @@ -class opnfv::foobar { - if $::osfamily == 'Debian' { - package { 'foobar': - ensure => installed, - } - } -} 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" |