summary |
shortlog | log |
commit |
commitdiff |
review |
tree
first ⋅ prev ⋅ next
Jonas Bjurel [Tue, 12 Jan 2016 08:57:29 +0000 (09:57 +0100)]
Deploy Scenario bug-fixes
- Fixed HA defenition for ODL-L2 and ODL-L3 in scenario.yaml
Change-Id: I60cbac779b2faa34f0bf96159839826e157295fe
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Mon, 11 Jan 2016 14:38:02 +0000 (15:38 +0100)]
Added a few more deply.sh arguments needed by Jenkins
Added arguments:
-B PXE Bridge for booting of Fuel master
-f Deploy on existing Fuel master
-F Do only create a Fuel master
-H NO Health check
-S Storage dir for VM images
Added checks for URI formats
Change-Id: I1f5138a2058e7b3274e9acf4bbbba243a427fb96
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Sat, 9 Jan 2016 15:01:50 +0000 (16:01 +0100)]
Small fixes to the deployment scenario framework:
- Added deploy.sh -d option for dryrun. With -d + all the other mandatory
arguments, deploy.sh produces ci/config/dea.yaml and /ci/config/dha.yaml
with out actually deploying the stack.
- Bugfix to exit with rc <> 0 if deployment fails.
- Don't delete the programatically constructed dea.yaml or dha.yaml
under fuel/ci/config after deploy has finished.
dea.yaml and dha.yaml are needed functest, therefore these files
must not be deleted after deployment has finished. They will reside
in fuel/ci/config/.
- Dont merge the dha-override section in deployment scenarios with the final
dha.yaml unless the deployment is virtual. There is no way you can
programatically override physicall resources, wireing, ipmi set-up, etc. -
while you can for virtual environments.
VERIFIED
READY TO MERGE
Change-Id: If4dedc472e07ed60071ee34c73db29f3b9c45252
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Sun, 10 Jan 2016 18:31:52 +0000 (19:31 +0100)]
ONOS scenario according to wanted config file structure
Replaces:
- https://gerrit.opnfv.org/gerrit/#/c/5999/
- https://gerrit.opnfv.org/gerrit/#/c/6003/
Description:
- Onos scenarios updated with needed dea and dha overrides, no scenario
specific information in other config files such dha, dea_base, dea_pod
override, etc.
- Added a virtual POD for Huawei-china specific needs, i.e. DNS and NTP.
- Small fix in deploy-conf.py
Change-Id: I85fe2fc4e9ec5fe0bc98ae7b399f2e49af6450f9
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Tue, 29 Dec 2015 21:16:57 +0000 (22:16 +0100)]
A simple method to separate configuration for base fuel, plugins, PODs
and deployment/test scenarios
READY TO MERGE!
Replaces: https://gerrit.opnfv.org/gerrit/#/c/3995/
Abstract
--------
This deployment framework relies on a configuration structure,
providing base installer configuration, per POD specific configuration,
plugin configuration, and deployment scenario configuration.
- The base installer configuration resembles the least common denominator
of all HW/POD environment and deployment scenarios (These configurations
are normally carried by the the installer projects in this case (fuel@OPNFV).
- Per POD specific configuration specifies POD unique parameters, the POD
parameter possible to alter is governed by the Fuel@OPNFV project.
- Plugin configuration - providing configuration of a specific plugin.
these configurations maintain there own namespace and are normally maintained
by collaborative projects building Fuel@OPNFV plugins
- Deployment scenario configuration - provides a high level, POD/HW environment
independent scenario configuration for a specific deployment. It defines what
features/plugins that shall be deployed - as well needed overrides of the
plugin config as well as the base installer-, POD/HW environment-
configurations. Objects allowed to override
is governed by the Fuel@OPNFV project.
Executing a deployment
----------------------
deploy.sh must be executed locally at the target lab/pod/jumpserver
A lab configuration structure must be provided - see the section below.
It is straight forward to execute a deployment task - as an example:
sudo deploy.sh -b file:///home/jenkins/config -l ericsson-1 -p pod-2
-s os_odl-l2_no-ha -i file:///home/jenkins/MyIso.iso
-b and -i arguments should be expressed in URI style. The resources can thus be
local or remote.
Feedback
--------
Please give feed-back before I'm going to far on a wrong tangent
Implemented scenarios so far:
-----------------------------
- os_ha
- os_no-ha
- os_odl-l3_ha
- os_odl-l3_no-ha
- os_odl-l2_ha
- os_odl-l2_no-ha
- os_onos_ha
- os_onos_no-ha
- os_kvm_ha
- os_kvm_no-ha
- os_ovs_ha
- os_ovs_no-ha
- os_kvm_ovs_ha
- os_kvm_ovs_no-ha
VERIFIED
READY TO MERGE
JIRA: FUEL-35
Change-Id: I94a9b477d8ed4ee8057c16d8f20fe543f7ecc20d
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Thu, 7 Jan 2016 12:07:55 +0000 (12:07 +0000)]
Merge "Templates for configuration guide"
Fatih Degirmenci [Wed, 6 Jan 2016 13:32:20 +0000 (14:32 +0100)]
Fix noha virtual deployment templates for Erisson blade
This change also move the noha templates into new directory structure
which is proposed as a separate change with change-id
I1ba1f1a7dd3951f4ce403ad2efde6a76130d533e
Change-Id: I0bae0c90ae99c8eea1bc43295e727962709ecbe0
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Sofia Wallin [Mon, 4 Jan 2016 13:01:39 +0000 (14:01 +0100)]
Templates for configuration guide
Please use the installerconfig.rst to describe the configuration for each installer. Removed configoptions from the patch, we will provide patches for the post install procedures template during the day.
Change-Id: If315520f153c60e12e6d188fc5e5ba8c1a5bd865
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
Ruijing Guo [Sun, 3 Jan 2016 21:22:45 +0000 (21:22 +0000)]
Update OVS Plugin
1. fix issue in https://gerrit.opnfv.org/gerrit/#/c/5179/
2. no change for OVS without DPDK
3. add OVS with DPDK packages
4. add DPPD
5. TODO: netvirt + OVS with DPDK
Change-Id: I153a95426d388d58933799e183d7b7316062e525
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
dongfeng [Tue, 29 Dec 2015 09:57:38 +0000 (17:57 +0800)]
upload onosfw plugin makefile
Change-Id: I70f81d0ad66d559a672ca037021b4256b18a202d
Jonas Bjurel [Mon, 21 Dec 2015 20:36:30 +0000 (21:36 +0100)]
Added Fuel plug-in builder for OVSNFV
JIRA FUEL-36
Change-Id: I354919bbed08dc2a449fa49334ca26d05e057676
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Ruijing Guo [Fri, 25 Dec 2015 00:36:43 +0000 (00:36 +0000)]
Merge "Update OVS Plugin"
Ruijing Guo [Wed, 23 Dec 2015 06:14:04 +0000 (06:14 +0000)]
Update OVS Plugin
1. no change for OVS without DPDK
2. add OVS with DPDK packages
3. add DPPD
4. TODO: netvirt + OVS with DPDK
Change-Id: I5e1e0c14bea0a2c3284d572cc2ab333486d119d1
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
Ruijing Guo [Wed, 23 Dec 2015 06:14:04 +0000 (06:14 +0000)]
Update KVM/QEMU
1. fix KVM/QEMU boot issue
Change-Id: I967e79e5a8eb6f349ad4feb61fa9701901e2913d
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
Daniel Smith [Tue, 22 Dec 2015 16:12:29 +0000 (16:12 +0000)]
Merge "Revert "Fix for the default virtaul enviroment template.""
Fatih Degirmenci [Tue, 22 Dec 2015 15:56:03 +0000 (15:56 +0000)]
Revert "Fix for the default virtaul enviroment template."
We need to revert this in order to be able to run virtual
deployments on Intel machine. The issue on Ericsson machine
needs to be looked into after the vacation period.
This reverts commit
6ffd176509318935eae6dd554a5fb70c255c6db3.
Change-Id: Ia0d33bee15f127016c3fda778b4327b5877f79f0
Fatih Degirmenci [Tue, 22 Dec 2015 15:52:10 +0000 (16:52 +0100)]
Remove extra controller from Ericsson POD2 DEA
Change-Id: I824e781f24a918fe724f3eb7194005cbf5962b5b
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
lmcdasm [Tue, 22 Dec 2015 06:10:46 +0000 (01:10 -0500)]
Fix for the default virtaul enviroment template.
Im not sure who / how this value was changed, but when you are doing a virtual "AUTOMATED" installation, then the value needs to remain as the FUEL VM, since in a nested
environment, the idea is NOT to allow the VM's external access (only to the FUEL VM on the ADMIN network )...
If you need to have a different "virtualConfiguration", the create a new subdirectory and a alternate configuration rather than the working / default template for CI for FUEL Nested Setup
Change-Id: I6163307bac285d710a5a5c683798a3c20c609932
Signed-off-by: lmcdasm <lmcdasm@OPNFV-VNCSRV1.opnfvericsson.ca>
JIRA: 007
Ruijing Guo [Mon, 21 Dec 2015 03:39:47 +0000 (03:39 +0000)]
Move install_docker.sh to common place
1. copy install_docker.sh in qemu plugin to docker/ubuntu-builder
2. change docker build in ovs & qemu
Change-Id: I3c0143e5e1b10a1cf798592d8bc05a49a5d12d48
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
Stefan K. Berg [Fri, 18 Dec 2015 11:53:46 +0000 (12:53 +0100)]
Align all plugins with new method for cache id
The cache tool is now responsible for returning the commit
ID of a branch, tag or commit. This change was first
introduced in the bgpvpn plugin and now the rest of the
plugins with a need for this are also using the same method.
Without this, a plugin pointing to a commit ID on master
would fail to build once the head of master is updated to
point to a later commit...
Change-Id: I7c32d5b41871741717ae42c1334e8557f0b0bedd
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Sofia Wallin [Mon, 14 Dec 2015 15:14:21 +0000 (16:14 +0100)]
Created a template for installer configuration
Change-Id: Ia47d104773987f6517eac2a198994d63c9f8122c
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
Jonas Bjurel [Mon, 21 Dec 2015 11:21:53 +0000 (12:21 +0100)]
Rebased with latest upstream ONOSFW plugin
Change-Id: Iaa8f101380124aae3c91f75702a89ab784884072
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Fatih Degirmenci [Sun, 20 Dec 2015 13:49:13 +0000 (14:49 +0100)]
Replace ericsson-pod2 dha and dea files with the working versions
Change-Id: Ia071dd3c76a5d3fc5f8418e39f123850358a00a6
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Stefan K. Berg [Fri, 18 Dec 2015 15:11:36 +0000 (16:11 +0100)]
Uplift of Docker versions
The Docker version 1.5.0 is no longer allowed to acces the
Docker remote image repository!
Switching to version 1.7.1 instead.
Change-Id: Id71cab4b26a02e98a3bb51f31caa394bcf25b7d9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Tue, 15 Dec 2015 14:57:46 +0000 (15:57 +0100)]
Fix for cache handling
Introduced a separate function "getcommitid" in the cache.sh
- a.k.a. $(CACHETOOL) - so that given a repo and a tag, branch
or commitid the corresponding commitid is returned.
The same principle should be used in all caching functions where
not a strict tag or head is specified (as git ls-remote will not
be able to figure out the commit id in those cases).
Change-Id: I3540dca7ab408c872eaabdc68d4058f9d6d7c45f
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Jonas Bjurel [Thu, 17 Dec 2015 12:18:11 +0000 (12:18 +0000)]
Merge "Updated Installation Instruction for FUEL B-REL WP1 (FUEL 7.0 rebasing)"
Sofia Wallin [Wed, 16 Dec 2015 14:34:35 +0000 (15:34 +0100)]
Updated Installation Instruction for FUEL B-REL WP1 (FUEL 7.0 rebasing)
Updates include:
- MTU Fix (JIRA FUEL-84)
- Updates for FUEL config (admin pwd, HTTP proxy option)
- Updates for FUEL 7.0 UI Elements
- Tagged areas for updated when ODL is available in next WP
- Corrected typo
- Changed name installation-intruction
- Changed name build-instruction
JIRA: FUEL-84
replacing change: https://gerrit.opnfv.org/gerrit/#/c/3449/
Change-Id: Ib855c67e7fbe93781a4252f43f2911d9c5fa0645
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
jose.lausuch [Wed, 16 Dec 2015 12:23:57 +0000 (13:23 +0100)]
Bugfix fuel-plugin-bgpvpn use wrong branch
This commit fixes the failing master build:
https://build.opnfv.org/ci/view/fuel/job/fuel-build-master/80/
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
On behalf of Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Change-Id: Idd7c6cf00f9bc0792d70953d57f4c32f223d547d
Jonas Bjurel [Thu, 10 Dec 2015 19:59:52 +0000 (20:59 +0100)]
Integration of ODL BGP-VPN plugin
READY TO MERGE
JIRA: FUEL-48
Change-Id: Idc44966f32caf8728580bac8bcc89981f7c987ba
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Ruijing Guo [Fri, 11 Dec 2015 06:23:23 +0000 (06:23 +0000)]
Update QEMU/KVM plugin
1. docker based build in qemu plugin
2. rebase to fuel 7.0
3. add kvm4nfv
Change-Id: I5aceeec5e5f88b936cea43fa07db36f65e332211
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
Ruijing Guo [Thu, 3 Dec 2015 01:47:50 +0000 (01:47 +0000)]
Docker based build for ovs and rebase to Fuel 7.0
Change-Id: I05ccabdb329dff31a52b3cd6c1b60148bee8efe9
Signed-off-by: Ling Yu <ling.y.yu@intel.com>
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
Fatih Degirmenci [Wed, 9 Dec 2015 13:39:51 +0000 (14:39 +0100)]
Add fuel templates for Ericsson Montreal Lab POD2
Change-Id: I45130cc7d3457ebafec1d9e31b95e03a10847c8f
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Jo¶rgen Karlsson [Wed, 9 Dec 2015 10:44:17 +0000 (11:44 +0100)]
Add fuel templates for Ericsson Montreal Lab POD1
Change-Id: Icc2f63569fd39d517ae5d29ef47839c1b6c742ba
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Daniel Smith [Wed, 9 Dec 2015 10:13:42 +0000 (10:13 +0000)]
Merge "FIX for getting all types of error log messages from /var/log/puppet.log on nodes"
Daniel Smith [Wed, 9 Dec 2015 10:08:28 +0000 (10:08 +0000)]
Merge "Refactor temporary directory creation"
Szilard Cserey [Tue, 24 Nov 2015 18:38:12 +0000 (19:38 +0100)]
FIX for getting all types of error log messages from /var/log/puppet.log on nodes
Change-Id: Id43e74fd3ebd1bd0c62e2aa963793d6b072e3fcc
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Stefan K. Berg [Wed, 9 Dec 2015 09:10:03 +0000 (09:10 +0000)]
Merge "Reaping improvements for Fuel 7"
Stefan K. Berg [Tue, 8 Dec 2015 10:21:19 +0000 (11:21 +0100)]
Reaping improvements for Fuel 7
In order to download the deployment information, the node id
must be explicitly specified.
The fuel setting commmand returns "ha_compact" as the mode for
a cluster, but Fuel does itself not understand this when changing
the settings - it needs to be named "ha".
Added shebang for reap.py and deploy.py.
Upped the default image sizes for the DHA template to match
Fuel 7.
Change-Id: I3ecacb83dc44454b90dedc98104658a16926dc1f
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Peter Barabas [Tue, 8 Dec 2015 12:05:57 +0000 (13:05 +0100)]
Refactor temporary directory creation
Use Python's tempfile instead of forking a shell for mktemp.
Change-Id: Icba442ea08d4098d67fb51575da16e85d4363beb
Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
jose.lausuch [Mon, 7 Dec 2015 10:27:25 +0000 (11:27 +0100)]
Change network config for LF-POD2 to match the current jumphost management interface.
Change-Id: Ia9b65ee67e7972a7def8c38a71f7fed212c68e60
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Stefan K. Berg [Wed, 2 Dec 2015 15:27:41 +0000 (16:27 +0100)]
Support for selecting which plugins to build
In order to cut the build time for unofficial builds, this change
supports setting the environment variable "BUILD_FUEL_PLUGINS" prior
to building.
Only the plugin targets from fuel/build/f_isoroot/Makefile that are
specified will then be built. In order to completely disable the
building of plugins, the environment variable is set to " ".
When using this functionality, the resulting iso file will be
prepended with the prefix "unofficial-" to clearly indiciate that
this is not a full build.
Change-Id: Ib0a914ed6577f54f31b056a752691316302081dc
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Mon, 30 Nov 2015 15:00:48 +0000 (16:00 +0100)]
Moved the noha virtual templates
This will complete the restructuring of the Fuel repo.
Change-Id: If2029617dca872741d6108362a7315833ae62c4e
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Mon, 30 Nov 2015 08:52:13 +0000 (08:52 +0000)]
Merge "Smaller non-HA virtual deployment template"
Fatih Degirmenci [Sun, 29 Nov 2015 20:23:45 +0000 (21:23 +0100)]
Remove doc configuration in order to use common config
Common doc generation configuration will be controlled from releng.
Change-Id: I4e79a9b7b620fd556eedafbfdc7b3eee223c98eb
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Fatih Degirmenci [Fri, 27 Nov 2015 11:40:35 +0000 (12:40 +0100)]
Enable new doc generation for fuel
The work to unify the doc generation for all OPNFV projects is currently
ongoing. This change adjusts docs directory structure for fuel project.
Trigger the fuel-verify build without cache.
verify: no-cache
Change-Id: Ie430b662c5b50d38efe0c8a1eb50aa8f01c85e85
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Jonas Bjurel [Fri, 27 Nov 2015 13:57:07 +0000 (14:57 +0100)]
ONOSFW SDN support
Implements a plugin builder for the ONOSFW Fuel plugin.
TODO:
- Naildown upstream plug-in to a specific tag/commit-id
NOT VERIFIED
DO NOT MERGE
JIRA: FUEL-56
Change-Id: I7c1a60446593ec860fc87a51255242388044e254
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Sat, 31 Oct 2015 11:36:09 +0000 (12:36 +0100)]
Plugin builder for OVS-NSH-DPDK
This plugin builder builds the OVS-NSH-DPDK plugin such
that it can be automatically deployed off-line (part of the .iso)
READY TO MERGE
Change-Id: Ied8e0a8d01baea932acc5eb3398cec48e44d5c04
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Fuel@OPNFV [Thu, 12 Nov 2015 14:10:01 +0000 (15:10 +0100)]
OPNFV qemu (KVM4NFV) plugin builder/installer.
This plugin builder builds the KVM4NFV plugin such that it can be automatically deployed off-line (part of the .iso)
READY TO MERGE
verify: no-cache
Change-Id: I1d4877c5fd83b4f4aee4432173edaf2a438406e3
Signed-off-by: Fuel@OPNFV <fuel@opnfv.org>
Michal Skalski [Fri, 27 Nov 2015 01:14:48 +0000 (02:14 +0100)]
Download plugins dependencies using fuel-createmirror
Including dependencies directly in to plugin binary require maintain list
of direct links to specific versions of system packages, which often
become out of date. This change propose to create requirements-deb.txt file
in plugin build directories which will contain only names of deb packages
needed for successful deployments in offline environments. Based on the
content of these files the common list of dependencies will be created [1].
Defined system packages together with their dependencies will be downloaded
during process of creating partial mirror.
[1] https://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html#troubleshooting-partial-mirror
verify: no-cache
Change-Id: If40b040fcf062f78af6c453a791b02ebf10e7b85
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
Jonas Bjurel [Wed, 25 Nov 2015 10:32:57 +0000 (11:32 +0100)]
Restructcture of the directory layout
Restructure of the directory layout due to move of Fuel into it's own repo
JIRA: FUEL-85
Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Stefan K. Berg [Tue, 24 Nov 2015 15:45:35 +0000 (16:45 +0100)]
Update of endpoint addresses
As https endpoints introduced in Fuel 7.0 has caused some
issues for the automated test setup, this reverts back to
the "non https" behavior as in 6.1 for both Horizon and
the endpoints, disabling https.
This is a *momentary* solution, we need to figure out how
to setup the testing infrastructure with secure endpoints
enabled!
Change-Id: Ida61c2fd0834861b26ab64afec87b2bfbd921e0e
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Mon, 23 Nov 2015 14:07:27 +0000 (15:07 +0100)]
Smaller non-HA virtual deployment template
Change-Id: I8eb9ff059e45d4f72ba7b750ff17661e0f3bade3
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Fuel@OPNFV [Sun, 15 Nov 2015 18:24:50 +0000 (19:24 +0100)]
Distributed plug-in configuration templates
This change proposes a new handling of plugin configuration files:
- Each plugin is responsible to carry own configuration template files
- Each of the plugin build fragments are responsible to copy these configuration
files to ..deploy/templates/plugins/.
- Later, some entity will be responsible to link rellevant configuration files
from ..deploy/templates/plugins to ..<deploy_environment>/conf/plugins_conf,
I.e. to respective/active deployment environment.
- The actual linking process is not in place yet, but it could for example be
deploy.sh, a separate deploy prep script or similar performing the linking
based on arguments, or a config file describing the wanted set-up.
Change-Id: Ia16a2c26bb1e1a51195be2382da502777d209a45
Signed-off-by: jonas.bjurel@ericsson.com <jonas.bjurel@ericsson.com>
Stefan K. Berg [Fri, 20 Nov 2015 15:54:14 +0000 (16:54 +0100)]
Rebase of ks.cfg due to upstream changes
Change-Id: I27b88dbfddb6e16650096aa50d6edd560ea7547a
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Michal Skalski [Thu, 19 Nov 2015 15:42:20 +0000 (16:42 +0100)]
Build OpenDaylight plugin for Fuel 7.0
Change-Id: Ifc529102b59d0aa3aa4b766cc592e7ee8c2eddc1
Stefan K. Berg [Mon, 26 Oct 2015 09:51:30 +0000 (10:51 +0100)]
Updating address of Fuel repositories
Change-Id: I2b1e328923390075854a08ee5d3942e4286a9073
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
Conflicts:
fuel/build/config.mk
Stefan Berg [Thu, 19 Nov 2015 12:32:18 +0000 (12:32 +0000)]
Merge "Autodeployment adaptation to Fuel 7"
Stefan K. Berg [Thu, 19 Nov 2015 12:32:08 +0000 (12:32 +0000)]
Merge "Disabling the ODL plugin waiting for Fuel 7 uplift"
Stefan K. Berg [Thu, 19 Nov 2015 12:31:50 +0000 (12:31 +0000)]
Merge "Fuel 7.0 rebase"
Szilard Cserey [Thu, 12 Nov 2015 19:44:58 +0000 (20:44 +0100)]
Autodeployment adaptation to Fuel 7
Change-Id: I5071b8d65828ab13a6b1a08b907289068104b27e
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Conflicts:
fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
fuel/deploy/templates/virtual_environment/conf/dea.yaml
Stefan K. Berg [Mon, 26 Oct 2015 09:52:42 +0000 (10:52 +0100)]
Disabling the ODL plugin waiting for Fuel 7 uplift
Change-Id: Ica4dfa6f1ab221bce62fdff0c9c065b4a93d76b5
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Wed, 7 Oct 2015 09:17:10 +0000 (11:17 +0200)]
Fuel 7.0 rebase
Initial change for the Fuel 7.0 rebase.
Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
Stefan K. Berg [Wed, 7 Oct 2015 09:17:10 +0000 (11:17 +0200)]
EXPERIMENTAL; DO NOT MERGE! Fuel 7.0 rebase
This is work in progress, do not merge but feel free to experiment
with this commit changeset as a base.
Change-Id: Ifbe1db9c892a94e64abbcfaaf1c98abce0c03dd4
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Conflicts:
fuel/build/config.mk
Szilard Cserey [Tue, 10 Nov 2015 21:14:22 +0000 (22:14 +0100)]
FIX for NTP and for error log fetching from nodes
Change-Id: I2d56ccc97216676f5bf01b7ea1b35aaade9c33da
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Szilard Cserey [Tue, 10 Nov 2015 19:51:48 +0000 (19:51 +0000)]
Merge "FIX for ODL tzdata dependency issue suggested by Michal Skalski"
Szilard Cserey [Mon, 9 Nov 2015 18:05:16 +0000 (19:05 +0100)]
FIX for ODL tzdata dependency issue suggested by Michal Skalski
Change-Id: Ia2b5e69318788a2c8c1c061ce9cc14cd3c020397
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Stefan K. Berg [Mon, 9 Nov 2015 10:08:26 +0000 (11:08 +0100)]
Add dependency checker tool
A simple script, check_dependencies.sh, has been put in the build
root. Given a file as argument, it will attempt to verify that all
URIs within said file are accessible. If not, an error message will be
presented and the script will exit with return code 1.
The script is added to the ODL plugin makefile, and used to verify the
Ubuntu and CentOS dependencies within.
Change-Id: I4bac9eb5e383629794f6f72baa5472f258e35bef
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Thu, 5 Nov 2015 16:01:51 +0000 (16:01 +0000)]
Merge "Removed bind mount of .ssh in runcontext"
Stefan K. Berg [Thu, 5 Nov 2015 13:17:54 +0000 (14:17 +0100)]
Removed bind mount of .ssh in runcontext
Previously the .ssh directory of the invoking user was bind mounted
into the build container. This behavior is now removed. The ssh keys
in the user's .ssh is however *copied* into the container if, and only
if, the RSYNC_CONNECT_PROG environment variable has been set as this
indicates the need to tunnel rsync traffic over (presumably) ssh. In
this case the keys may actually be needed.
In both cases the .ssh/config file will be updated with the
StrictHostKeyChecking=no
option to prevent failure due to the ssh confirmation dialogue.
Change-Id: Ic2ecc9d7a9abfa796bdfa6aaa8cde0dcb632d76e
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Szilard Cserey [Thu, 29 Oct 2015 09:22:18 +0000 (10:22 +0100)]
minor fixes
fix for error log collecting feature
Change-Id: I4db2ac19421301e1745a3beed90f32df57d75f8d
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Szilard Cserey [Wed, 28 Oct 2015 09:50:52 +0000 (09:50 +0000)]
Merge "Plugin config + bugfix + refactoring"
Szilard Cserey [Tue, 20 Oct 2015 12:18:37 +0000 (14:18 +0200)]
Plugin config + bugfix + refactoring
ignoring external repo errors during plugin installation
refactoring import common
Install only those plugins which have a yaml config file located under plugins folder
collect puppet errors from all nodes
Change-Id: I8d5248cf31c4877a6d59bfcfe62b43daf4ad43ef
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
Stefan K. Berg [Tue, 27 Oct 2015 00:10:33 +0000 (00:10 +0000)]
Merge "Support for building Fuel behind a http proxy"
Stefan K. Berg [Mon, 19 Oct 2015 14:52:34 +0000 (16:52 +0200)]
Support for building Fuel behind a http proxy
The build system is now able to work also behind a traditional web
proxy setup if the http_proxy, https_proxy and (if needed) no_proxy
environment variables has been set prior to invoking make.
This is a joint work by Gillian Dunne <gillian.dunne@intel.com> and
Stefan Berg <stefan.k.berg@ericsson.com>.
Verification so far has been with a mock setup, placing the build
machine behind a Squid proxy and blocking outgoing traffic not going
through the proxy by firewall rules. The following environment
variables was set in the host for these tests:
RSYNC_PROXY=10.0.0.1:8888
http_proxy=http://10.0.0.1:8888
https_proxy=http://10.0.0.1:8888
no_proxy=localhost,127.0.0.1,.consultron.com,.sock
*** IMPORTANT NOTE ABOUT THE HOST PROXY SETTINGS ***
The build system will make use the following proxy environment
variables:
http_proxy:
https_proxy
no_proxy
RSYNC_PROXY
RSYNC_CONNECT_PROG
During the build phase, a local Ubuntu package repository is fetched
from upstream in order to be added to the OPNFV Fuel ISO and for parts
of this process rsync is used.
This will require that either RSYNC_PROXY is set according to the
format "<proxy host>:<proxy port>" and that the proxy indicated indeed
allows rsync traffic *or* that RSYNC_CONNECT_PROG is set to use an
alternative transport. For a detailed explanation of these settings,
see the rsync manual page.
*** IMPORTANT NOTE ABOUT THE HOST DOCKER DAEMON SETTINGS ***
The Docker daemon on the host must be configured to use the http proxy
for it to be able to pull the base Ubuntu 14.04 image from the Docker
registry before invoking make! In Ubuntu this is done by adding a line
like:
export http_proxy="http://10.0.0.1:8888/"
to /etc/default/docker and restarting the Docker daemon.
Change-Id: Ieed2269af295d90a4b33d834f723889bdf9c7dc6
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Michal Skalski [Mon, 19 Oct 2015 14:46:32 +0000 (16:46 +0200)]
Update addresses of fuel repositories
As described on this page [1] stackforge git namespace is deprecated.
Fuel together with associate projects (plugins etc.) is now moving to
openstack namespace.
[1] https://wiki.openstack.org/wiki/Stackforge_Namespace_Retirement
Change-Id: Id843e5512f27c9c106afbc2dc33a4fb322abb639
Jonas Bjurel [Thu, 8 Oct 2015 17:47:12 +0000 (19:47 +0200)]
CAN MERGE
VERIFIED
Description: Update of a few information files
JIRA: IMPROVEMENT
Change-Id: I792d4d79b1fda048231819de9be73c3467f3625a
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Stefan K. Berg [Fri, 16 Oct 2015 12:18:32 +0000 (14:18 +0200)]
Copy gitinfo.txt to the root of the Fuel master
The gitinfo.txt file contains the SHA1 of all upstream repos
used during the build of the install ISO (including the OPNFV
Fuel repo as well). Move these to the root directory of the
nstalled Fuel master as well for easy reference.
Change-Id: I23caadc23c69744a980027ef24d974f11efc37bd
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Thu, 15 Oct 2015 10:51:26 +0000 (12:51 +0200)]
Improved caching functionality and tracability
In order to enable the caching of more build artifacts than the Fuel
iso during CI builds, the caching functionality and the CI build
frontend "build.sh" has been rewritten.
The build.sh script will now rely on the "make cache" functionality of
the top Makefile to make sure that the build is using cache handling.
The underlying cache logic is implemented in "cache.mk" for the top
makefile and those recursive levels that do not produce cachable
artifacts themselves in that they are only calling the SUBDIRS of
their lower level (like f_isoroot).
All "leaf" Makefiles will however need to implement three cache
targets in their top Makefile (for visibility):
clean-cache:
Clean all files relating to the handling of caches.
get-cache:
Attempt to fetch a cached artifact using a SHA1 key.
put-cache:
Store a built artifact into the cache.
They can just implement a simple "no-op" functionality for thes
targets if they do not have any use of the caching functionality.
If they are to use the caching functionality, they must make sure to
implement a logic that produces a SHA1 hash based on the source of the
data they are to cache - for upstream repos one suggestion is to use
the commit ID of the used upstream HEAD. For examples, see the top
Makefile that implements this logic for the Fuel ISO build, taking
into consideration the commit IDs of all the upstream repositories
used.
To improve tracability, the root directory of the ISO will contain the
file gitinfo.txt, which is meant to detail the upstream repo and
commit ID used for all upstream dependencies of a build. If you are
adding additional upstream dependencies, make sure to use the
repo_info.sh tool to add this data.
The cache tool cache.sh has no notion of the cache data it is storing
- from the tools perspective, cache data is just a binary blob piped
in or out of the tool.
This blob is stored by the cache tool at the cache location as
<SHA1>.blob, together with an associated meta file <SHA1>.meta.
The cache meta file currently holds just one line:
Expires: <epoch time>
This file is expected to be used to iterate through the cache objects
and retire those who's expiry date has passed. Currently objects will
always have an expiry date of two weeks into the future, but down the
road the "cache put" functionality may be amended with an optional
"age" argument that can set a different expiration time.
New tools in this commit:
cache.sh - the cache logic
repo_info.sh - the (optionally recursive) repo information logger
Change-Id: I8a40546c21febeecc9de6d82c0ceb6bc60b04205
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Thu, 8 Oct 2015 16:06:00 +0000 (18:06 +0200)]
Updated logic for selecting Ubuntu repo for mirroring
A slight improvement to Michal Skalski's original concept just
to filter out repos where updates are in progress (which would
leave us hanging).
Change-Id: Id641b3aa82b991c23b5742d1f64ff79cfbbd708c
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Wed, 7 Oct 2015 18:54:05 +0000 (20:54 +0200)]
Temporary fix for forcing cache rebuild
The caching functionality will be greatly improved for the next
release - this is a quick fix for having the possiblility to
invalidate the cache forcefully when needed.
Change-Id: I4d83907255105fb454af6fb426193acc744fdba9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Stefan K. Berg [Fri, 9 Oct 2015 05:09:08 +0000 (05:09 +0000)]
Merge "Rebased patch due to upstream changes"
Stefan K. Berg [Thu, 8 Oct 2015 18:55:06 +0000 (20:55 +0200)]
Rebased patch due to upstream changes
Change-Id: I63e39ff3d08bcfb80b83bb0c42082deb680ad727
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Jonas Bjurel [Wed, 7 Oct 2015 14:10:16 +0000 (16:10 +0200)]
CAN MERGE
VERIFIED
Description: Improved handling of docker clean-up
JIRA: FUEL-71
Change-Id: I565f77e227da2dcbaecd86582ab6890508726607
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Stefan K. Berg [Wed, 7 Oct 2015 14:11:07 +0000 (16:11 +0200)]
Modifications due to upstream changes
Removed a patch which is now incorporated upstream.
Added debmirror as a requirement for the build Docker
container.
Change-Id: I92fa8571019ece9bac41bec2baa3629d286a3a51
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Liyi Meng [Mon, 5 Oct 2015 07:55:20 +0000 (09:55 +0200)]
Add AMT adapter
This adapter allow fuel deploy over Intel AMT/vPro system.
Please note that the adapter use amttool to interact with
target system, which imply that it only support up to
vPro v7.
Change-Id: I75f0882ea914b57d7d62338ed803a45104bc2d4e
Signed-off-by: Liyi Meng <liyi.meng@ericsson.com>
Jonas Bjurel [Fri, 2 Oct 2015 11:29:56 +0000 (13:29 +0200)]
Move of genesis/fuel master branch: commit
563547b4a9f44090f32c0e17d040114854563760
Note: other installers and /common are removed
Change-Id: Ie5a2b0b7f3e7fa2eda191710c98456eeec17ed61
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Jonas Bjurel [Wed, 12 Aug 2015 14:30:48 +0000 (16:30 +0200)]
Modified INFO
Added Licence.rst
Change-Id: I610e75eccd44adff177122dd8e3a93a44e83d28e
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Aric Gardner [Fri, 10 Jul 2015 17:21:00 +0000 (13:21 -0400)]
Adding .gitreview INFO and License
Change-Id: I31333946c4095c3e96f541f3fcc62cdeabd17a77
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Aric Gardner [Fri, 10 Jul 2015 15:07:46 +0000 (15:07 +0000)]
Initial empty repository