Age | Commit message (Collapse) | Author | Files | Lines |
|
Previously, Armband Makefile used to call Fuel@OPNFV Makefile
target <iso>, instead of <all>, which resulted in bypassing
using Docker for ISO building completely.
Switch to <all> Makefile target, hence bringing back Docker
as a build container.
This change justifies moving make variables to a separate spec
file, armband.mk.
While at it, enable caching of builds.
This requires Jenkins bash scripts to be updated for the ISO
build job, done in [1].
JIRA: ARMBAND-56
[1] https://gerrit.opnfv.org/gerrit/#/c/18453/
CHANGES:
- all: release (was all: build)
- Common make targets now depend on submodules-init;
- clean-build and clean-docker make targets have been replaced by:
make clean, make deepclean;
FIXME: These issues should be fixed later:
- (optional) trim local repo paths from gitinfo files
- only account for armband submodules in cache fingerprints;
- identify size mismatch culprit
Change-Id: I7d73409be44983fa21d4c09d2e07b87a33231e03
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Ubuntu arm64: While keeping kernel 4.2 for Trusty
(linux-image-generic-lts-trusty), set 4.4 backported from Xenial
(linux-image-generic-lts-xenial) as default kernel for Armband ISO.
Xenial kernel 4.4 for Trusty has been tested with:
- AMD Softiron;
- APM Mustang;
- Cavium ThunderX;
While at it, remove obsoleted rtc-efi fixes.
Notes:
- keep 4.2 kernel inside the ISO;
- selecting 4.2 kernel may be done via deploy settings, by
overriding kernel flavor when calling `fuel-bootstrap`;
Related-bug: ARMBAND-48
Change-Id: Ice1f95939f0d7d9491befd20030740850b1a0e61
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Upstream change [1] requires us to to adapt our Fuel@OPNFV patches.
[1] https://gerrit.opnfv.org/gerrit/#/c/17969/
Change-Id: I9823469df575cc929e399a6025aca6066a16e98d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I78606b3dca803c7bf1d872cf067b2bd5f8a8aa91
|
|
Change-Id: I97c9c79bb342d6c7504414134649795689b5e78b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
JIRA: ARMBAND-59
Change-Id: I031e1c20bcb7d5bb15b26dce18364a4994f4d0d7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Backport from upstream proposed change [1] in Fuel@OPNFV.
[1] https://gerrit.opnfv.org/gerrit/#/c/17563/
Prereq for: ARMBAND-48
Change-Id: Ia5a2073532e578b663f8f45bfe90b9fe36df77cc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Ubuntu arm64: While keeping kernel 4.2 for Trusty
(linux-image-generic-lts-trusty), add 4.4 backported from Xenial
(linux-image-generic-lts-xenial) to Armband ISO.
Xenial kernel 4.4 for Trusty has been tested with:
- AMD Softiron;
- APM Mustang;
- Cavium ThunderX;
While at it, remove obsoleted armband-rtc-efi-fix Debian package,
which was only needed on targets that are not compatible with 4.4,
and we plan on retiring soon.
v2->v3:
- keep 4.2 kernel instead of replacing it;
- selecting 4.4 kernel will be done via deploy settings, by
overriding kernel flavor when calling `fuel-bootstrap`;
- dropped test changes, not needed when both 4.2 and 4.4 are in;
TODO:
- switch default kernel flavor to 4.4 when all our PODs are ready;
Closes: ARMBAND-48
Change-Id: I37600f12dd01facbd552f1d2d721bc7a3e0e2750
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Previous commit which was supposed to fix the BUILD_ID being too
long mistakenly altered the submodule code for computing the
short SHA, instead of altering the Makefile.
Fixes: ARMBAND-53
Change-Id: Ib1c1b3dc9592714fd86a59ae1a64001bd2930bd3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Previous change altered the BUILD_ID to include Armband commit info
instead of Fuel@OPNFV info, and also a marker to indicate it comes
from Armband repo.
This lead to the ISO volume ID becoming too long:
"Making ISO...
genisoimage: Volume ID string too long
make[1]: *** [iso] Error 255"
While at it, change our marker from "FUEL_AARCH64" to "ARMBAND_FUEL",
as our ISO should also support x86 in the future, not only arm64.
Fixes: ARMBAND-53
Change-Id: I52526f1f7861aca71d16d1e6b6b2a9566a6c7d3f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: Ia268e17a7a8b0c2c47209e47feb6f77394036283
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Upstream change [1] removed Czech mirror patch.
[1] https://gerrit.opnfv.org/gerrit/#/c/17225/
Change-Id: Id986899aa83b3cb7d228a266b1b8a8f5a942ba49
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Closes: ARMBAND-53
Change-Id: I92c1541a22a837c281d9b86f6ee8da327305884d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
In order to clean up old partitioning and boot entries on target
nodes, before removing the Fuel Master, try ssh-ing into it and
removing all environments/nodes.
This is especially important for EFI systems, where old boot
entries are left behind without a proper env delete, leading to
target nodes failing to PXE boot on Fuel Master re-install.
This change assumes that:
- all Fuel Master information is unchanged between old and new
deploy (fuel IP, password etc.);
- Fuel Master is up and running, in a sane state (target nodes
are also online), when deploy starts;
Closes: ARMBAND-51
Change-Id: I52b853b37a0d226a9cb33179f7aeb65eff74da4e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I493279d81b32a58b918f2b6caa0cf869a0caa674
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
|
|
|
|
Change-Id: Icbbba0bee68a8fe9de76dbf3c339e01da43fb3a2
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
|
|
Previous change [1] introduced the addition of an iptables rule
that was supposed to allow SSH access on all ifaces (not only
admin iface) when additional ifaces are configured.
However, Fuel installer is flushing the rules after transplant
adds our SSH config, overwriting it.
Move iptables SSH config to post-install section, as standalone
script. In order to keep the same behavior, test ifcfg-eth0
(admin interface is expected to be called eth0 by convention)
for "DEFROUTE=no" and only whitelist SSH on all ifaces if it matches.
[1] https://gerrit.opnfv.org/gerrit/#/c/16571/
Change-Id: I086b75461daa62671cad10494fe34acfd77757ae
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Change-Id: Iae462ebe89ff3bc351addd12a8f5cc5ecdef2b11
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
|
|
Change-Id: I2cd1899d82878dfece22ed546e1ff24d5387e8c1
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
|
|
Previously (in Fuel 8.0), SSH used to listen only on 10.20.0.2
(admin interface), which required editing sshd_config and restarting
SSH server for allowing SSH connections over the public IP on eth1
(just an example, which corresponds to Armband PODs use cases).
In Fuel 9.0, SSH server on Fuel Master listens on all ifaces,
but connections are filtered by iptables.
This change piggy-backs on a previous Armband addition that allows
transplant.py script to configure additional interfaces (e.g. public).
In case additional interfaces have been configured by transplant,
this change will instruct iptables to accept SSH connections on ANY
interface, not only the admin one.
Possible improvements:
- limit SSH access to admin + interfaces added by transplant instead
of ANY;
Change-Id: I0923496e1b23f6dc826c8afbbe9805956c2d4b34
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
For some reason, our docker sandbox builder already has dh-systemd
when checking for "fuel-agent" build-deps, and therefore skips
adding it as a build dep inside the chroot, leading to debuild fail.
Backporte upstream fix for this from [1].
[1] https://review.openstack.org/#/c/325210/
Change-Id: Ieece9b2250bd91e688bd0f203240da5234930558
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: Iea330d6d778ff5034e1e801d20fa74485e302a95
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Fuel@OPNFV just added the Yardstick plugin.
This plugin is a little different, instead of breaking fuel plugin
code apart from the contents (i.e. fuel-plugin-yardstick separate
from yardstick itself), it holds both fuel plugin metadata and
actual yardstick code in the same repo.
So far, yardstick plugin code itself is arch-independant and should
not be touched.
TODO:
- add yardstick patches for arm64 until we can validate Yardstick;
- submit patches added locally in Armband to upstream
(Yardstick@OPNFV);
Change-Id: I24bc8858b92c9bdd529a64de833d7b98c06a6ade
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I986bfb5ae549321a0696f945d24ccb1b6b198f96
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
Move fuel-main patching to opnfv-fuel, preparing for upstreaming
this to Fuel@OPNFV.
Drop fuel-main submodule!
Change-Id: I12b995f37701658dca1d1a212ede029d0e03231c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
|
|
|
|
Rebase conflicting patches due to format change.
Change-Id: Ia9d1f9c0cad77da7b95e8ec4b62324953ef3ce9c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Skip parsing comment lines in ifcfg-ethX files at reap, e.g.:
Change-Id: Ide6b2111619f7558f1434fda5cd254b842cef0ae
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I9442f217d2f840382b40f6eae77ddb9ae2ddbadc
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
|
|
Change-Id: I3702648583983ac7afcfef7a9556fcd33e984457
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I3c7bd7f9be85078783a2e95dfe480cffc08534d1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I158c58cb01112d2113a75dd425275cf9531d49fc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
Change-Id: I927bb36b0ac4628630f90649027441a895c6f774
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
This is highly unlikely to be upstreamed in any other form than this.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
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
|
|
|
|
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
|
|
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>
|