aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore10
-rw-r--r--LICENSE.rst8
-rw-r--r--README9
-rw-r--r--TODO6
-rwxr-xr-xbuild/docker/ubuntu-builder/install_docker.sh9
-rw-r--r--build/f_example_packadd/Makefile42
-rw-r--r--build/f_example_packadd/README47
-rw-r--r--build/f_example_packadd/foobar_1.0-1/DEBIAN/conffiles1
-rw-r--r--build/f_example_packadd/foobar_1.0-1/DEBIAN/control10
-rwxr-xr-xbuild/f_example_packadd/foobar_1.0-1/DEBIAN/postinst2
-rw-r--r--build/f_example_packadd/foobar_1.0-1/etc/foobar/foobar.conf2
-rwxr-xr-xbuild/f_example_packadd/foobar_1.0-1/usr/bin/foobar2
-rw-r--r--build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/changelog.Debian5
-rw-r--r--build/f_example_packadd/foobar_1.0-1/usr/share/doc/foobar/copyright18
-rw-r--r--build/f_example_packadd/puppet/modules/opnfv/manifests/foobar.pp7
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config.mk2
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config/bgpvpn_config.yaml6
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/post-scripts/00_post_example.sh10
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/post-scripts/03_install_repo.sh10
-rwxr-xr-xbuild/f_isoroot/f_bootstrap/pre-scripts/00_pre_example.sh10
-rw-r--r--build/f_isoroot/f_odlpluginbuild/config/opendaylight_config.yaml52
-rw-r--r--build/f_isoroot/f_odlpluginbuild/packages.yaml8
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/config/onosfw_config.yaml17
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config/ovs-nsh-dpdk-config.yaml6
-rw-r--r--build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config/ovsnfv-dpdk-config.yaml7
-rw-r--r--build/f_isoroot/f_qemupluginbuild/config/qemu_config.yaml6
-rwxr-xr-xbuild/f_isoroot/f_repobuild/opnfv_mirror_conf.py9
-rwxr-xr-xbuild/f_isoroot/f_repobuild/select_ubuntu_repo.sh9
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/config/qemu_config.yaml7
-rw-r--r--deploy/README8
-rw-r--r--deploy/config/dea_base.yaml13
-rw-r--r--deploy/config/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml9
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml10
-rw-r--r--deploy/config/labs/devel-pipeline/huawei-ch/fuel/config/dea-pod-override.yaml9
-rw-r--r--deploy/config/plugins/fuel-bgpvpn_0.0.1.yaml9
-rw-r--r--deploy/config/plugins/fuel-nfvkvm_0.0.1.yaml9
-rw-r--r--deploy/config/plugins/fuel-nfvovs_0.0.1.yaml9
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.1.yaml9
-rw-r--r--deploy/config/plugins/fuel-odl_0.0.2.yaml9
-rw-r--r--deploy/config/plugins/fuel-onos_0.0.1.yaml9
-rw-r--r--deploy/config/plugins/fuel-onos_0.0.2.yaml9
-rwxr-xr-xdeploy/deploy.py29
-rw-r--r--deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml2
-rw-r--r--deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml2
-rw-r--r--docs/configguide/installerconfig.rst5
-rw-r--r--docs/configguide/postinstall.rst6
-rw-r--r--docs/index.rst6
-rw-r--r--onboarding.txt7
48 files changed, 254 insertions, 252 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9b4b3afa3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*.pyc
+.project
+.pydevproject
+ci/config/
+deploy/autodeploy.log
+*~
+.*.sw?
+/docs_build/
+/docs_output/
+/releng/
diff --git a/LICENSE.rst b/LICENSE.rst
index efee103a7..67ef17d2a 100644
--- a/LICENSE.rst
+++ b/LICENSE.rst
@@ -1,4 +1,10 @@
-Copyright 2015 Open Platform for NFV Project, Inc. and its contributors
+LICENSE
+=======
+This document is protected/licensed under the following conditions
+(c) Jonas Bjurel (Ericsson AB)
+Licensed under a Creative Commons Attribution 4.0 International License.
+You should have received a copy of the license along with this work.
+If not, see <http://creativecommons.org/licenses/by/4.0/>.
Open Platform for NFV Project Software Licence
==============================================
diff --git a/README b/README
index 8b1378917..4629763a3 100644
--- a/README
+++ b/README
@@ -1 +1,10 @@
+##############################################################################
+# 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
+##############################################################################
diff --git a/TODO b/TODO
deleted file mode 100644
index ba7c6152a..000000000
--- a/TODO
+++ /dev/null
@@ -1,6 +0,0 @@
-#########################################################################
-# Contributors/version/date
-# jonas.bjurel@ericsson.com 1. 2015.10.8
-#########################################################################
-Following items needs to be done to achieve an Brahmaputra SR0 Fuel@OPNFV Stack:
-Please see: https://jira.opnfv.org/secure/RapidBoard.jspa?rapidView=41&view=detail
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.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index 18acc8fd9..fc85c059e 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
@@ -9,4 +9,4 @@
BGPVPN_BRANCH=master
BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE=7137636587724561bf437e84295e0fb6f6f9aef1
+BGPVPN_CHANGE=27c8f609472b74a9205d244e4d93378b5a9ebfae
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"
diff --git a/deploy/README b/deploy/README
index 7a3e09dc9..5067e7045 100644
--- a/deploy/README
+++ b/deploy/README
@@ -1,3 +1,11 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# peter.barabas@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
+##############################################################################
======== PREREQUISITES ========
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
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 96cf14f26..bf0b39d42 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -13,8 +13,10 @@ import os
import io
import re
import sys
-import netaddr
import yaml
+import errno
+import signal
+import netaddr
from dea import DeploymentEnvironmentAdapter
from dha import DeploymentHardwareAdapter
@@ -38,6 +40,7 @@ FUEL_VM = 'fuel'
PATCH_DIR = 'fuel_patch'
WORK_DIR = '~/deploy'
CWD = os.getcwd()
+MOUNT_STATE_VAR = 'AUTODEPLOY_ISO_MOUNTED'
class cd:
@@ -118,6 +121,7 @@ class AutoDeploy(object):
self.patch(tmp_new_dir, new_iso)
except Exception as e:
exec_cmd('fusermount -u %s' % tmp_orig_dir, False)
+ os.environ.pop(MOUNT_STATE_VAR, None)
delete(self.tmp_dir)
err(e)
@@ -126,9 +130,11 @@ class AutoDeploy(object):
os.makedirs(tmp_orig_dir)
os.makedirs(tmp_new_dir)
exec_cmd('fuseiso %s %s' % (self.iso_file, tmp_orig_dir))
+ os.environ[MOUNT_STATE_VAR] = tmp_orig_dir
with cd(tmp_orig_dir):
exec_cmd('find . | cpio -pd %s' % tmp_new_dir)
exec_cmd('fusermount -u %s' % tmp_orig_dir)
+ os.environ.pop(MOUNT_STATE_VAR, None)
delete(tmp_orig_dir)
exec_cmd('chmod -R 755 %s' % tmp_new_dir)
@@ -336,7 +342,28 @@ def parse_arguments():
return kwargs
+def handle_signals(signal_num, frame):
+ signal.signal(signal.SIGINT, signal.SIG_IGN)
+ signal.signal(signal.SIGTERM, signal.SIG_IGN)
+
+ log('Caught signal %s, cleaning up and exiting.' % signal_num)
+
+ mount_point = os.environ.get(MOUNT_STATE_VAR)
+ if mount_point:
+ log('Unmounting ISO from "%s"' % mount_point)
+ # Prevent 'Device or resource busy' errors when unmounting
+ os.chdir('/')
+ exec_cmd('fusermount -u %s' % mount_point, True)
+ # Be nice and remove our environment variable, even though the OS would
+ # would clean it up anyway
+ os.environ.pop(MOUNT_STATE_VAR)
+
+ sys.exit(1)
+
+
def main():
+ signal.signal(signal.SIGINT, handle_signals)
+ signal.signal(signal.SIGTERM, handle_signals)
kwargs = parse_arguments()
d = AutoDeploy(**kwargs)
sys.exit(d.run())
diff --git a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
index a5f3fc5e2..3890286e4 100644
--- a/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
@@ -58,7 +58,7 @@ dea-override-config:
environment:
mode: ha
net_segment_type: tun
- wanted_release: Kilo on Ubuntu 14.04
+ wanted_release: Liberty on Ubuntu 14.04
nodes:
- id: 1
interfaces: interfaces_1
diff --git a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
index 780d9746a..0eecc0bce 100644
--- a/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
+++ b/deploy/scenario/no-ha_odl-l2_bgpvpn_scenario_0.0.1.yaml
@@ -58,7 +58,7 @@ dea-override-config:
environment:
mode: ha
net_segment_type: tun
- wanted_release: Kilo on Ubuntu 14.04
+ wanted_release: Liberty on Ubuntu 14.04
nodes:
- id: 1
interfaces: interfaces_1
diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst
index dd4a43330..d89033ec5 100644
--- a/docs/configguide/installerconfig.rst
+++ b/docs/configguide/installerconfig.rst
@@ -1,3 +1,8 @@
+.. This document is protected/licensed under the following conditions
+.. (c) Jonas Bjurel (Ericsson AB)
+.. Licensed under a Creative Commons Attribution 4.0 International License.
+.. You should have received a copy of the license along with this work.
+.. If not, see <http://creativecommons.org/licenses/by/4.0/>.
<Project> configuration
=======================
diff --git a/docs/configguide/postinstall.rst b/docs/configguide/postinstall.rst
index 1702cea5f..52e0a5c30 100644
--- a/docs/configguide/postinstall.rst
+++ b/docs/configguide/postinstall.rst
@@ -1,3 +1,9 @@
+.. This document is protected/licensed under the following conditions
+.. (c) Jonas Bjurel (Ericsson AB)
+.. Licensed under a Creative Commons Attribution 4.0 International License.
+.. You should have received a copy of the license along with this work.
+.. If not, see <http://creativecommons.org/licenses/by/4.0/>.
+
<Project> post installation procedures
======================================
Add a brief introduction to the methods of validating the installation
diff --git a/docs/index.rst b/docs/index.rst
index f8ff58d26..f57f71204 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,3 +1,9 @@
+.. This document is protected/licensed under the following conditions
+.. (c) Jonas Bjurel (Ericsson AB)
+.. Licensed under a Creative Commons Attribution 4.0 International License.
+.. You should have received a copy of the license along with this work.
+.. If not, see <http://creativecommons.org/licenses/by/4.0/>.
+
.. OPNFV Release Engineering documentation, created by
sphinx-quickstart on Tue Jun 9 19:12:31 2015.
You can adapt this file completely to your liking, but it should at least
diff --git a/onboarding.txt b/onboarding.txt
index e98f426c1..c9c45ac0d 100644
--- a/onboarding.txt
+++ b/onboarding.txt
@@ -1,3 +1,10 @@
+###########################################################################
+This document is protected/licensed under the following conditions
+(c) Jonas Bjurel (Ericsson AB)
+Licensed under a Creative Commons Attribution 4.0 International License.
+You should have received a copy of the license along with this work.
+If not, see <http://creativecommons.org/licenses/by/4.0/>.
+###########################################################################
Get on board by filling this out and submitting it for review.
This is all optional, it's just to give you a taste of the workflow.