summaryrefslogtreecommitdiffstats
path: root/fuel/build/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2015-09-25Fuel patch to enable virtual deploymentStefan K. Berg1-0/+9
Disable ext4 journalling during Fuel master image creation, otherwise the provisioning process times out on many virtual setups after 3600 sec. All credit to Michal Skalski of Mirantis for providing the information to patch this up: https://docs.mirantis.com/openstack/fuel/fuel-6.1/release-notes.html#issues-with-image-based-provisioning https://review.openstack.org/#/c/197943/ Change-Id: I90f68a351b3afe1273440846bc5d56da8f6d3507 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-09-18Tidied up the last references to ODLJonas Bjurel1-7/+2
Change-Id: I715f47461622f2d26a492eb61d68b20ca84825aa Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-09-10Refactoring build system to support Fuel 6.1Stefan K. Berg1-16/+9
As Fuel 6.1 has changed both Debian package handling (fetching repositories from Internet) as well as Puppet packaging, the support for patching these has been disabled. The pre-deploy logic of Fuel has been removed together with a number of patches applied on top of a Fuel build, among them fixes for NTP, DNS and /etc/hosts injection. Instead, when changed default behavior is required, this will be introduced as Fuel plugins which more cleanly integrates into the Fuel system, and also decouples additional functionality from the ISO build stage. Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2015-08-25Removed ODL_DOCKER implementation (DEPRECATED FOR PLUGIN ARCH IN FUEL ↵Daniel Smith1-2/+0
6.1/SR1 OF ARNO) Change-Id: I8643d268c5d5e3395725667deb50b5f9df7c3f09 JIRA:0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
2015-08-25Removed opendaylight build capabilities as a preparation toward Arno SR1Jonas Bjurel1-7/+1
Note: The local branch name "removedocker" is missleading! Change-Id: I4086bb3f47f720407a6356796a9724367cca2898 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-08-12Needed rebase after fuel dev-ops changesJonas Bjurel1-0/+8
Patch needed after updated fuel devops repo key change Reference: https://github.com/stackforge/fuel-main/commit/82e77c7f476a23220f44b74c7f32fc04a7189a4e#diff-9d30c16c74e663e5cdb1dc7d9189ed2d Patch needed after updated fuel devops python package versions Reference: https://github.com/stackforge/fuel-main/commit/a765460d3fd69089e3b4d2b3a6b55e28e6fb53eb Rebased site.pp Change-Id: I138b383b0d57091a81f98acae3b6e7af6a189632 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-06-26Revert "Adding in support for Lithium container."Jonas Bjurel1-2/+0
since it doesnt deploy This reverts commit eb887812da568cfb4908f6ae14449b2ceaeb5bc0. Change-Id: Ia7490d86c1d91abca1f50d90f43bdf3e4917f23a
2015-06-12Adding in support for Lithium container.Dan Smith1-0/+2
Both will be present on the controller nodes and can be started/switches on and off at will. Networking scripts are not updated - will be deprecated in favour of plugin method of enabling / setting up VXLAN / OVSDB integration pulling from the latest nightly artifact at time of commit - will work on automated pulling each night to see if that makes sense. Change-Id: Ie911cdf61cd97a99b975c30c55c664daf70eb3ee JIRA: 0 Signed-off-by: Dan Smith <daniel.smith@ericsson.com>
2015-04-16Fix debootstrap packageMichal Skalski1-1/+2
This commit provide scripts to patch debootstrap package. This should fix problems that can occur during ubuntu 12.04 installation. More detail can be found here: * https://bugs.launchpad.net/ubuntu/+source/debootstrap/+bug/1001131 * https://wiki.debian.org/DebianInstaller/Modify/CD#Workaround_bug_in_deboostrap Change-Id: I881191a37ba22d336c61623ae506f7e75dcc7540 JIRA: Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2015-04-02Fix problems during build/deployment processMichal Skalski1-0/+1
If we used 'make all' for build iso, only release section from f_odl_docker Makefile was executed, so odl docker image and docker binary were not created. This patch also try resolve problems which appeared during execution of start_odl_container.sh on controller node: * install and run cgroup-lite to mitigate 'failed to find the cgroup root' error * use proper path to docker image and binary * prevent import of docker image before daemon is not fully initialized * because docker binary is delivered by puppet, we should execute commands against it, not try use system binary which is probably not present on controller node * stop use daemon mode('-d') of 'docker run' if user want to have access to container shell * fix name of start script which is run inside container when daemon mode is used It looks like file 'fuel/build/f_odl_docker/scripts/start_odl_container.sh' is not used and duplicate: 'fuel/build/f_odl_docker/puppet/modules/opnfv/scripts/start_odl_container.sh' JIRA: Change-Id: Ia6064dbacf30902bda557e5d0b631b5f5f207b5e Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2015-03-26Fuel build cache handlingJonas Bjurel1-23/+23
- Cache invalidation supported in case cache is outdated compared to upstream. - Fully automated build.sh integration tests added (build.sh -t or build.sh -T) - Rebased to Daniel Smiths's patch-set: genesis refs/changes/71/171/4 - Yet untested, will perform automated integration tests over night! - Updated based on Stefan's comments (no more revs.) - Fixed a bug in f_odl_docker/Makefile - validate-cache target added in f_odl_docker/Makefile JIRA: BGS-1 Change-Id: I9f8f30c2a85fd7bf04dab1b566065e5739d4fcb1 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-03-24TOPIC: ODL DOCKERDaniel Smith1-14/+7
AUTHOR: DANIEL SMITH *** PLEASE MERGE ** UPDATED TO REFLECT INPUT FRMO J. BJUREL - fixed whitespaces - fixed location of .erb file (they should have been in templates - the directory was there just int he wrong spot) - removed opcheck.pp from common opnfv class - Removed Debug from fuel/build/Makefile :) UPDATE: Input from S. Berg and F. Bockners incorporated. Merge required before we can refactor to common puppet manifest directory This patchset delivers the folowing functionality: - implementation of the common/opnfv-puppet structure / move of .pp files and update of f_odl_docker to build / source from there - creation of f_odl_doc subclass - fetch of latest stable release of ODL - fetch of latest docker binary release (TODO: this will be changed in next patchset push) - build of docker container with all needed libs and port exposure for DLUX and OVSDB/ODL with Openstack Integration (OVS Manager) - deployment of both the target odl docker image as well as the docker runtime binary to the control nodes via puppet script. GENERATES: - docker-latest - binary of docker for use on control node - odl_docker_image.tar - a docker container with a ODL controller running DLUX and OVSDB ENABLE / DISABLE: - Comment/Un-comment "SUBDIRS += f_odl_doc in base (fuel/build/) Makefile Breakdown of Update / Edits per File: ===================================== fuel/build/Makefile - Modified include to capture the newly created f_odl_doc directory fuel/build/f_odl_docker/Makefile - Fetches libraries and produces two outputs: docker-latest - binary of docker (actually lxc-docker cause ODL Container is running 12.04 (precise) libraries - i.e java7, tz 12.04, etc) odl_docker_image.tar - this is a docker image defined in ./dockefile/Dockerfile and contains the ODL distro + setup and deployment scripts for runtime on the target control node. fuel/build/f_odl_docker/dockerfile/Dockerfile - This Dockerfile defined the packages for use in the Docker Container that will run ODL with DLUX and OVSDB submodules. It also defines the ports to be exposed to the HOST OS (and thus as well through docker the ODL Controller exists in a private, but routable via but the fuel (10.20.0.0/16) and the tenants public network since docker handles the mapping (see the docker run command in the start_odl_docker.sh script) fuel/build/f_odl_docker/dockerfile/check_feature.sh - Simple expect script that starts up a client and checks that the features are installed (used during visual demo only) TODO - Replace with API call to ODL KARAF to install features (LOOKUP - Dont know how to address Karaf programatically - LOOKUP) fuel/build/f_odl_docker/dockerfile/speak.sh - Expect script called by odl_start_docker.sh once karaf is up to install the features that we need (runtime inside container script) called via ENTRYPOINT in Dockerfile at runtime on control node. fuel/build/f_odl_docker/dockerfile/start_odl_docker.sh - This is the CMD/ENTRYPOINT defined in docker and is what is called from the controller when you start the container (note: This runs inside the conatiner), not to be confused with staring the actual container on the control node). This script fires up Karaf first time, loads DLUX and OVSDB modules and monitors that the container is up. The container itself is started on the control node via /opt/opnfv/start_odl_container.sh which includes the syntax for the port mapping (RANDOM or 1:1). TODO - integrate into controller monitor script to ensure better handling (stop, start, monitor) of docker processes remove expect helper scripts and replace with API/JSON or some other appropriate method to KARAF fuel/build/f_odl_docker/puppet/modules/opnfv/manifests/odl_doc.pp - This puppet manifest defined where the docker binary and docker image should be placed on the target control node. /opt/opnfv/start_odl_container.sh will install docker binary package (if necessary) and load ODL docker image into docker, start the image. This file just ensures placement in /opt/opnfv/odl_docker fuel/build/f_opnfv_puppet/puppet/modules/opnfv/manifests/init.pp (MODIFICATION): - Removed previous includes and updated to have only f_odl_doc added fuel/build/f_odl_doc/scripts/start_odl_container.sh - this is the control script that will start the docker container (to be run on the control node), this is deployed this is deployed to /opt/opnfv on the control node via odl_doc puppet manifest file. JIRA: DEPRECATED: Deleted files are no longer needed due to new implementation of ODL. Change-Id: I26c13cc468a2aba18af78b7a3c78a719033f03e0 Signed-off-by: Daniel Smith <daniel.smith@ericsson.com>
2015-03-17*** FIRST VERSION OF CI BUILD SCRIPT ***Jonas Bjurel1-23/+41
- Provides build cache management to a remote location - Provides automatic cashe repopulation - See /fuel/ci/README - Rebased to master - Bug around cache handling fixed - New option -r introduced to invoke external script/program instead of standard http(s)/fttp get and put, eg. scripts or programs to integrate with dropbox, or similar. The script needs to anheaer to curl argument list. - Stefan Berg's comments implemented - Fatih Degirmenci's comments implemented with one exemption: the revision state .iso naming convention still remains the same - we need to discuss this. With the implementation of Fatih's comments the build.sh argument structure is slightly changed, please see ./build.sh -h TODO: - Further testing - Finalize cache invalidation logic - Make refactoring JIRA: Change-Id: I4efdbdd10f726c0a3229849a63040b6d2702db5c Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2015-03-09Starting point for ODL IntegrationJonas Bjurel1-0/+140
***CAN BE MERGED*** - ODL build and installation (puppet manifests) including needed dependencies - Modified in accordance with Randy Levensalors comments - Added chmod 4755 /bin/fusermount due to that lately some systems dont install fuseiso withe SUID set for fusermount. Investing ongoing on why and why not consistent. - Rebased with master - ODL disabled in top Make (enable it by uncommenting the odl dirs - Removed white spaces - Hopefully fixed an issue with the docker ubuntu repos, added --no-cache=true to the fuel/docker/Make file. TODO: - Refactor collecting ODL and Java dependencies to one common place - Refactoring top Makefile - Adding CI hooks for build and deploy - Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>