summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-12-09Merge "Refactor temporary directory creation"Daniel Smith4-4/+8
2015-12-09Merge "Reaping improvements for Fuel 7"Stefan K. Berg3-6/+27
2015-12-08Reaping improvements for Fuel 7Stefan K. Berg3-6/+27
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>
2015-12-08Refactor temporary directory creationPeter Barabas4-4/+8
Use Python's tempfile instead of forking a shell for mktemp. Change-Id: Icba442ea08d4098d67fb51575da16e85d4363beb Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2015-12-07Change network config for LF-POD2 to match the current jumphost management ↵jose.lausuch1-12/+12
interface. Change-Id: Ia9b65ee67e7972a7def8c38a71f7fed212c68e60 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2015-12-03Support for selecting which plugins to buildStefan K. Berg4-2/+39
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>
2015-11-30Moved the noha virtual templatesStefan K. Berg10-0/+0
This will complete the restructuring of the Fuel repo. Change-Id: If2029617dca872741d6108362a7315833ae62c4e Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-30Merge "Smaller non-HA virtual deployment template"Stefan K. Berg10-0/+1242
2015-11-29Remove doc configuration in order to use common configFatih Degirmenci3-35/+1
Common doc generation configuration will be controlled from releng. Change-Id: I4e79a9b7b620fd556eedafbfdc7b3eee223c98eb Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
2015-11-29Enable new doc generation for fuelFatih Degirmenci7-0/+63
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>
2015-11-28ONOSFW SDN supportJonas Bjurel4-1/+103
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>
2015-11-28Plugin builder for OVS-NSH-DPDKJonas Bjurel4-1/+105
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>
2015-11-27OPNFV qemu (KVM4NFV) plugin builder/installer.Fuel@OPNFV4-1/+104
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>
2015-11-27Download plugins dependencies using fuel-createmirrorMichal Skalski3-2/+5
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>
2015-11-27Restructcture of the directory layoutJonas Bjurel190-10445/+0
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>
2015-11-25Update of endpoint addressesStefan K. Berg5-11/+11
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>
2015-11-25Smaller non-HA virtual deployment templateStefan K. Berg10-0/+1242
Change-Id: I8eb9ff059e45d4f72ba7b750ff17661e0f3bade3 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-21Distributed plug-in configuration templatesFuel@OPNFV12-209/+1
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>
2015-11-20Rebase of ks.cfg due to upstream changesStefan K. Berg2-2/+2
Change-Id: I27b88dbfddb6e16650096aa50d6edd560ea7547a Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-19Build OpenDaylight plugin for Fuel 7.0Michal Skalski2-5/+2
Change-Id: Ifc529102b59d0aa3aa4b766cc592e7ee8c2eddc1
2015-11-19Updating address of Fuel repositoriesStefan K. Berg1-1/+1
Change-Id: I2b1e328923390075854a08ee5d3942e4286a9073 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com> Conflicts: fuel/build/config.mk Conflicts: fuel/build/config.mk
2015-11-19Merge "Autodeployment adaptation to Fuel 7"Stefan Berg7-365/+923
2015-11-19Merge "Disabling the ODL plugin waiting for Fuel 7 uplift"Stefan K. Berg1-1/+3
2015-11-19Merge "Fuel 7.0 rebase"Stefan K. Berg0-0/+0
2015-11-19Autodeployment adaptation to Fuel 7Szilard Cserey7-365/+923
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
2015-11-19Disabling the ODL plugin waiting for Fuel 7 upliftStefan K. Berg1-1/+3
Change-Id: Ica4dfa6f1ab221bce62fdff0c9c065b4a93d76b5 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-11-19Fuel 7.0 rebaseStefan K. Berg8-72/+256
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
2015-11-18EXPERIMENTAL; DO NOT MERGE! Fuel 7.0 rebaseStefan K. Berg8-72/+256
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
2015-11-12FIX for NTP and for error log fetching from nodesSzilard Cserey3-12/+19
Change-Id: I2d56ccc97216676f5bf01b7ea1b35aaade9c33da Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-11-10Merge "FIX for ODL tzdata dependency issue suggested by Michal Skalski"Szilard Cserey5-41/+41
2015-11-09FIX for ODL tzdata dependency issue suggested by Michal SkalskiSzilard Cserey5-41/+41
Change-Id: Ia2b5e69318788a2c8c1c061ce9cc14cd3c020397 Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-11-09Add dependency checker toolStefan K. Berg2-0/+43
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>
2015-11-05Merge "Removed bind mount of .ssh in runcontext"Stefan K. Berg1-13/+37
2015-11-05Removed bind mount of .ssh in runcontextStefan K. Berg1-13/+37
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>
2015-11-05minor fixesSzilard Cserey3-5/+7
fix for error log collecting feature Change-Id: I4db2ac19421301e1745a3beed90f32df57d75f8d Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
2015-10-28Merge "Plugin config + bugfix + refactoring"Szilard Cserey33-488/+552
2015-10-27Plugin config + bugfix + refactoringSzilard Cserey33-488/+552
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>
2015-10-27Merge "Support for building Fuel behind a http proxy"Stefan K. Berg8-27/+246
2015-10-26Support for building Fuel behind a http proxyStefan K. Berg8-27/+246
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>
2015-10-19Update addresses of fuel repositoriesMichal Skalski2-2/+2
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
2015-10-19CAN MERGEJonas Bjurel3-5/+5
VERIFIED Description: Update of a few information files JIRA: IMPROVEMENT Change-Id: I792d4d79b1fda048231819de9be73c3467f3625a Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-10-16Copy gitinfo.txt to the root of the Fuel masterStefan K. Berg1-1/+2
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>
2015-10-15Improved caching functionality and tracabilityStefan K. Berg15-853/+592
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>
2015-10-09Updated logic for selecting Ubuntu repo for mirroringStefan K. Berg2-5/+34
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>
2015-10-09Temporary fix for forcing cache rebuildStefan K. Berg1-0/+5
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>
2015-10-09Merge "Rebased patch due to upstream changes"Stefan K. Berg2-28/+30
2015-10-08Rebased patch due to upstream changesStefan K. Berg2-28/+30
Change-Id: I63e39ff3d08bcfb80b83bb0c42082deb680ad727 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-10-08CAN MERGEJonas Bjurel1-10/+27
VERIFIED Description: Improved handling of docker clean-up JIRA: FUEL-71 Change-Id: I565f77e227da2dcbaecd86582ab6890508726607 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-10-07Modifications due to upstream changesStefan K. Berg3-44/+1
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>
2015-10-05Add AMT adapterLiyi Meng4-20/+119
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>