summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
Diffstat (limited to 'build/f_isoroot')
-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
14 files changed, 55 insertions, 104 deletions
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"