summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-06-13Merge "Fix: f-w: Nailgun `current_release` obsoleted."Alexandru Avadanii1-3/+2
2016-06-12Rework: Move xz/gzip switch to post-install.Alexandru Avadanii2-35/+52
This is highly unlikely to be upstreamed in any other form than this. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Fix: f-w: Nailgun `current_release` obsoleted.Alexandru Avadanii1-3/+2
Upstream fuel-web change "Remove legacy patching code" [1] obsoletes `current_release` definition in `deployment_serializers.py`. Update our nailgun patch that adds arch field to no longer rely on this functionality. [1] https://review.openstack.org/#/c/280708/ Change-Id: I93b3691be860427da320c5c0a2c799dcc4158afd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-12Rework: Move fuel-astute patch to post-install.Alexandru Avadanii5-37/+49
IMPORTANT: Drop `fuel-astute` submodule, and patch it instead during the Fuel Master node bootstrapping process, using an OPNFV post.d script. Luckily, this fits well with the recently added script that prepares FM for cross-building. One step closer to un-forking. Change-Id: Ia612e0ad4077b16baf54f1b9ebf9d207daca0be4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-10post-scripts: Enable systemd-binfmt for first boot.Alexandru Avadanii1-0/+96
ARMBAND NOTE(S): - This is a bug fix + a new feature (arch list in a file on FM) - This is overengineered because: * we want to move patching to post-ISO creation, OPNFV style; * easier integration with Fuel@OPNFV, using post-install scripts; * prepare for true multiarch support on Fuel Master; IMPORTANT: This commit introduces the following file on Fuel Master, containing the list of arch supported for target nodes: </etc/fuel_openstack_arch>. This file is created AFTER pre.d OPNFV scripts are ran, also by bootstrap_admin_node.sh, BEFORE the post.d scripts are executed. NOTE: Arch format is the same used by dpkg (e.g.: "amd64 arm64") Based on the number of foreign architectures we should support (the list of archs in /etc/fuel_openstack_arch minus native arch), we determine whether cross-builds are expected, in which case binfmt support should be functional during first Fuel Master boot. Since systemd-binfmt service has a series of preconditions for starting, which are tested early during first boot, some of them are NOT YET true (e.g. no binfmt handlers are present before qemu-user-static package is installed), so the service is not automatically started. Of course, this only affects the first boot. Finally, this commit adds an OPNFV post-install script in /opt/opnfv/bootstrap/post.d, which starts systemd-binfmt service. Change-Id: I6dbe4b3ac5a2fd076881d6778ff66b82bb6c7379 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-09FIXME: Temporary: Backport: build local mirrors.Alexandru Avadanii4-17/+189
Backport upstream pending patch "Build local mirrors for stable/mitaka" from [1]. Minor rebase for two other patches after applying this series. [1] https://gerrit.opnfv.org/gerrit/#/c/15259 Change-Id: I362e08be3460d711de064a487fdcc8c76fc69af9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08Rebase: p/f/deploy-reap-extra-eth: context update.Alexandru Avadanii1-3/+1
Update patch `deploy/reap.py: Dump extra interfaces information.` after upstream change was merged [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/15275/ Change-Id: I9fd74775030732cc0759610228fa80a0cec72352 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08Rebase: rm p/f/Allow-customizing-fuel-plugin-odl.Alexandru Avadanii2-30/+3
Upstream change [1] made this patch obsolete. While at it, update related patch context after same change. [1] https://gerrit.opnfv.org/gerrit/#/c/14385/ Change-Id: I21753e4dafdd0ab83c5eac37f394aa704bbe236b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08Fix: f-l: s/nailgun::/fuel::/cobbler::preseed.Alexandru Avadanii1-3/+3
The nailgun puppet module has been replaced with fuel puppet module. This change needs to be reflected in our cobbler preseed function, which I missed during the initial rebase. [1] https://github.com/openstack/fuel-library/commit/ 74a68f493ff215ce8dfc67c3af6d06dd5a2db194 Change-Id: Ie13861ff75fc289ab03190f48fcfb5579499db1e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08FIXME: Temporary: Remove repo-mirror-cz.patch.Alexandru Avadanii1-0/+62
Upstream removed all mirrors but usa and cz, and changed its default to mirror.fuel-infra.org in [1]. This allows us to drop patching of fuel-main/config.mk with the Czech mirror. If needed, USE_MIRROR=cz can be specified as an env var. FIXME: Remove when Fuel@OPNFV pulls change and deals with it. [1] https://github.com/openstack/fuel-main/commit/ 751d502cfe15d9c9df0ee89530ac3b0b73aa1638
2016-06-08Merge "Fuel deploy: timestamp for newly created images"Alexandru Avadanii1-0/+39
2016-06-08Merge "Rebase: deploy related patch series."Alexandru Avadanii28-155/+226
2016-06-08Updated armbandStefan Berg1-0/+0
Project: fuel 14f07bc7ecb9f166d5244abcc5789d8fd584c0dd ISO: Use --joliet-long names. Armband adds similar files, which tend to have long names and only differ in suffixes (e.g. DEBs for amd64 vs arm64). This works around ISO build error(s) like: "genisoimage: Error: ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_amd64.deb and ./ubuntu/pool/main/g/golang-gogoprotobuf/golang-gogoprotobuf\ -dev_0.0~git20150828.0.6cab0cc-1~u14.04+mos1_arm64.deb have the same Joliet name" Change-Id: I89d9816d86176d80bcc76f5f90c8391b0664ab82 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-08Updated armbandMichal Skalski1-0/+0
Project: fuel 6f9e8e2c829412d350644fa6a820a8a2890f69b7 Do not create files when check connectivity Change-Id: If0ab25ee843f9892510da3d3c8d1f10a54440545 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-08Updated armbandStefan K. Berg1-0/+0
Project: fuel a87426e28f604517de39f778b7a216ecf75e172a Script to clean expired build cache items Change-Id: I5e466c89c05eb4d637778218cfe03b88d569f331 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-08Updated armbandPeter Barabas1-0/+0
Project: fuel 7b6a386fe58d96ff476cd8c34a18c6e7bce8895f Fix for not reaping 'ssh_network' Change-Id: Ib225701a808211e50554c8f1762325aa75ecc33f Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-06Updated armbandMichal Skalski1-0/+0
Project: fuel c4afb1da513ef3230432fff400ea231660b230c9 Build odl plugin for mitaka Change-Id: I59b96a424a753f880b4ac16abd806851ad3f9533 Signed-off-by: Michal Skalski <mskalski@mirantis.com>
2016-06-04Fix: nailgun_syncdb upgrade to Fuel 9.0.1.Alexandru Avadanii1-2/+2
Armband database migrations were applied on top of Fuel 8.0, creating two heads: 43b2cb64dae6 (branchpoint) -> 11a9adc6d36a -> f9b7fd91ac19 (head) Update our change to be applied on top of Fuel 9.0.1. Change-Id: If5b2ff1aa082227cebd268a2515b78a350166598 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-04Makefile: Mitaka update.Alexandru Avadanii1-3/+1
Remove unnecesary overrides from Makefile. Switch Armband repo from 8.0 to 9.0, trimming "-fuel" repo URL suffix. ODL plugin build remains enabled. All other plugins are currently not built. Some cleanup is due in the future: FIXME: Switch to our own JDK later. FIXME: Remove FUEL_CENTOS_8.0 stuff. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-04Rebase: ODL Fuel plugin arm64 support patch.Alexandru Avadanii1-26/+21
ODL plugin package is now arch-independent, drop arm64 hardcode. FIXME: Some arm64 hardcodes remain in place, like installing quagga package. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-04Fixture: fix wrong identation (missing space)Alexandru Avadanii1-1/+1
This prevented YAML parsers from reading the Mitaka fixtures configuration file. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-04Rebase: p/f-l: Update VGA defaults patch context.Alexandru Avadanii1-3/+3
Minor change upstream requires us to rebase this patch.
2016-06-04Rebase: deploy related patch series.Alexandru Avadanii28-155/+226
After change "common.py: catch stderr in exec_cmd" [1] and other unrelated changes were merged upstream, we need to rebase the complete deploy related series. While we're at it, re-export Fuel@OPNFV patches in Armband. [1] https://gerrit.opnfv.org/gerrit/#/c/14561/ Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
2016-06-03Fuel deploy: timestamp for newly created imagesJosep Puigdemont1-0/+39
All images created are named opnfv.iso, this is not sustainable in an environment where several PODs might share the same libvirt storage pool. For this we need unique names, and the time stamp is a cheap way for now to achieve this. Change-Id: I8a7d34036898b8b4e57b23c11bee643876e1829c Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-06-03Merge "Upstream: p/common.py: catch stderr in exec_cmd."Alexandru Avadanii1-40/+0
2016-06-03Merge "Upstream: ODL file limit patch was merged upstream"Alexandru Avadanii1-31/+0
2016-06-03Merge "p/Separate-armband-repo no longer needed."Alexandru Avadanii1-43/+0
2016-06-03Merge "Submodule(s) rebase on stable/mitaka."Alexandru Avadanii7-0/+0
2016-06-02Merge "Rebase: Sync after Build system uplift to Fuel 9.0"Alexandru Avadanii4-49/+85
2016-06-02Updated armbandPeter Barabas1-0/+0
Project: fuel 6c498c04a9843bcc99dc94650e5d0b31490dfa1b Download deployment config after modification Modified network or interface configurations were not reflected in the deployment config, resulting in faulty node configurations. Change-Id: I4ca20702c0171e7995f2b4f46317557ec9d5beac Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-02Updated armbandStefan K. Berg1-0/+0
Project: fuel 2498bbb0354fd7abbbb408810f419c2999c23a31 Auto deploy corrections for Fuel 9.0 - The auto deployer's detection of nodes being up corrected as "fuel node" now returns "1" instead of "True" to denote that the node is up. - The location of bootstrap_admin_node.sh has changed so the detection of whether the Fuel node installation needed a correction for the deployer not to throw an exit code and terminate prematurely. - Small fix: deploy.py is now executable (just a chmod change). Change-Id: I8fed7bafe6912f8b4278619bbdaa16577a82737b Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-06-01Updated armbandJonas Bjurel1-0/+0
Project: fuel 0ac1af6354f57c389b407cb1ea1e0365027704a6 docs: Mitaka Build req: Add p7zip-full. Build system uplift to Fuel 9.0/Mitaka now requires `7z` cmd utility also on the builder host (not only inside docker containers), so document this as a prereq in the build instructions. [1] https://gerrit.opnfv.org/gerrit/#/c/13919/ Change-Id: Icb57ac58c499272fce0a27bb2d25383e933c7814 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-06-01Upstream: p/common.py: catch stderr in exec_cmd.Alexandru Avadanii1-40/+0
See Fuel@OPNFV change [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/14561/
2016-06-01Upstream: ODL file limit patch was merged upstreamAlexandru Avadanii1-31/+0
See upstream commit [1]. [1] https://github.com/openstack/fuel-plugin-opendaylight/ commit/5012455d58ddfda5894130ca14d8fb7d6b4c8b60
2016-06-01p/Separate-armband-repo no longer needed.Alexandru Avadanii1-43/+0
Since Fuel@OPNFV switched from carrying the orig ks.cfg to a patch for this file in "Build system uplift to Fuel 9.0/Mitaka" [1], we (Armband) can now drop this patch. [1] https://gerrit.opnfv.org/gerrit/#/c/13919/
2016-06-01Submodule(s) rebase on stable/mitaka.Alexandru Avadanii7-0/+0
2016-06-01Updated armbandPeter Barabas1-0/+0
Project: fuel 74454885828f33629f0355616017b67768bc7bd8 Clean up after ourselves Change-Id: Id7579ef618b8cd922de325d9dc1c0b7a6c5587a7 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-06-01Updated armbandDaiel Smith1-0/+0
Project: fuel 1378a27086272efec083778dd52fb27511b88167 A small edit for the uplift to Mitaka from Liberty Signed-off-by: Daiel Smith <daniel.smith@ericsson.com> JIRA:0
2016-05-31Updated armbandJosep Puigdemont1-0/+0
Project: fuel 3b8db706acb60b680bcf220bd0236d5efcc66d07 common.py: catch stderr in exec_cmd When running commands with exec_cmd(), the stderr of the command is sent to /dev/null and ignored, and only stdout is retrieved. Thus, when a command fails and check is enabled, only the output of stdout is presented to the user, which normally holds no information about the error. In this patch we retrieve stderr, and when an error occurs, an exception is raised with that message. Fixes https://jira.opnfv.org/browse/FUEL-142 Change-Id: I3940e1a43963a6abec362481b1d4ce7bd7cb816d Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
2016-05-31Rebase: Sync after Build system uplift to Fuel 9.0Alexandru Avadanii4-49/+85
Refresh patches after Fuel@OPNFV migrated to Mitaka in [1], "Build system uplift to Fuel 9.0/Mitaka". >As bootstrap_admin_node.sh has >been transitioned into an RPM (fuel-support), the lazy designer found >it more simple to patch that script during the Fuel build phase than >at the OPNFV ISO generation. The patch mechanism has been changed to >a normal context diff instead of the orig/modified file tuples >previously used. Hopefully this will require fewer manual rebases >(may the fuzz be with us!). >Also the ks.cfg patching has transitioned to a context based ordinary >patch for the same reasons, but this is as before taking place during >OPNFV ISO generation. [1] https://gerrit.opnfv.org/gerrit/#/c/13919/
2016-05-31Updated armbandStefan K. Berg1-0/+0
Project: fuel ec0c7698cd363b71694ca33e87f65fc382acda8d Build system uplift to Fuel 9.0/Mitaka Switching to Fuel 9.0/Mitaka for the build system. Overhaul of the patching mechanism. As bootstrap_admin_node.sh has been transitioned into an RPM (fuel-support), the lazy designer found it more simple to patch that script during the Fuel build phase than at the OPNFV ISO generation. The patch mechanism has been changed to a normal context diff instead of the orig/modified file tuples previously used. Hopefully this will require fewer manual rebases (may the fuzz be with us!). Also the ks.cfg patching has transitioned to a context based ordinary patch for the same reasons, but this is as before taking place during OPNFV ISO generation. Patch naming made more descriptive. The reaping mechanism has been slightly modified due to a change in the naming of the node files when these are generated by the Fuel CLI. IMPORTANT 1: The package cache mechanism is currently disabled, it is only possible to install Fuel with a direct internet connection. This will be fixed in a later change set! IMPORTANT 2: All plugins has been disabled! As you have re-certified your plugin with Fuel 9.0, please re-enable it in build/Makefile! Change-Id: Ia918d16a74b68f89d178e06befe6e8a7a9367bf9 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
2016-05-30Updated armbandJonas Bjurel1-0/+0
Project: fuel ebb5b355ba542fc22b8f96f952439251d4b2c90b Remove residual Lab & configuration DEA and DHA from the unprotected Fuel repo This needs testing!!!! On a follow-up release, this also needs rebasement, the libvirt templates are still in here - they shouldnt, sinse we dont want Lab specific configs in the Fuel repo. NOT VERIFIED DO NOT MERGE Change-Id: I069ced81b886405463f27f37a6ec78e3748b37b7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-05-26Merge "bootstrap: Add lshw package (also in fuel-mirror)."Alexandru Avadanii2-5/+48
2016-05-26Merge "deploy: ipmi adapter: Add <port> config support."Alexandru Avadanii1-0/+74
2016-05-26deploy: ipmi adapter: Add <port> config support.Alexandru Avadanii1-0/+74
Sometimes the IPMI lanplus protocol listens on a non-standard remote port, e.g. when target nodes are interfaced through a fake IPMI BMC application that listens on multiple ports on the same IP address. Therefore, allow setting IPMI port in the DHA using a new property named `ipmiPort`, and pass it along to `ipmitool` when set. CHANGE: get_access_info now also supports specifying the IPMI port to use with `ipmitool` by configuring the `ipmiPort` property in the DHA. hp_adapter.py: updated `get_access_info` return signature with the new (unused there) `ipmiport`. Change-Id: Ibff1309b17733af1a6fc8c5008495f42d7ef084a
2016-05-25Updated armbandJonas Bjurel1-0/+0
Project: fuel 370cf3546e2f5e3a7afa69b4f306bd7c90d44397 More rigorous Fuel environment check get_env() used to raise an unhandled exception when reap.py was run on a Fuel node which didn't yet have an environment set up. Change-Id: I07c37db2d80e416d26fa4fb4907f4e438f1c44e5 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
2016-05-25Merge "Fix indentation and add patch-import output"Alexandru Avadanii1-1/+2
2016-05-25Merge "Fix improper patch rebase"Alexandru Avadanii3-72/+87
2016-05-25Merge "Correct libvirt template patch"Alexandru Avadanii1-34/+22
2016-05-24Updated armbandJonas Bjurel1-0/+0
Project: fuel b0b2e869cae884aaed305f2984701dc813a469ec docs/install-instr: Add target specific cfg sect. Fuel 8.0 adds support for setting up "Offloading Modes" for target nodes. Document how this features should be used (and why/when it's necessary), and also its common limitation of not being applied during Verify Networks step (see related Fuel bug report [1]). While at it, fix minor reference to branch in git tag checkout instructions, as we'd be in detached HEAD and not on a new branch. [1] https://jira.opnfv.org/browse/FUEL-134 [Alexandru.Avadanii@enea.com] Only minor edits and prepared for upstreaming, this is mostly based on previous work from Florin. Change-Id: If7a8ca44541903dbeb6db36bc64fe56b132165cb Signed-off-by: Florin Dumitrascu <florin.dumitrascu@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>