summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-01-10Update git submodulesYang Yu1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/euphrates' - buf-fix: sfc quota setting JIRA: BOTTLENECK-215 compass master does not enable sfc, only eupurates. changing sfc quota will cause error for "not valide attributes" Change-Id: I77fab2d957d88bed6ed28c06bff9d3c2f7fb0da7 Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com> (cherry picked from commit 97a77626cc17fb372a78ddfc78a66e483315b864)
2018-01-09Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Disable notebook preview job" - Disable notebook preview job - the job does not work for patch with *.ipynb deletion - qtip has migrated to rst for formula display Change-Id: I4882f55ac7d9d4430a15c1f0237e0b9d6e223f47 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2018-01-09Update git submodulesRyota Mibu1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Converting INFO file to Yaml" - Converting INFO file to Yaml This is a proposed format for switching the INFO file to a machine readable format. Notable changes to the INFO file: * Adds Meeting information: time, date, location, agenda, etc. * Updates Commiter info to include: Linux Foundation IDs and Timezone Change-Id: I05aaef36e44978d2abc73f5f18757d91ee6002d0 Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
2018-01-09Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "[cleanup] Drop cfg01 node def for ODL L2" into stable/euphrates - [cleanup] Drop cfg01 node def for ODL L2 Remove obsolete ODL L2 top node definition, which currently breaks `reclass-salt --top`. Change-Id: Ic05f87dd7edea5b9f38e996bb02a3e1062caf98a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "[centos jump] Add missing dependency for nbd build" into stable/euphrates - [centos jump] Add missing dependency for nbd build Change-Id: Icb23d2e6d3bb6e49b54e2d51cc8a35cb03702fcd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 60e790a986e64a47f4242766500f1aee6a3083ed)
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - lib.sh: base image: Prevent using incomplete img In case the previous deploy attempt already copied the base image as the VCP image in order to perform offline operations and failed, leaving an incomplete image in place, current code might try to use it instead of building it from scratch. Use the hash-agnostic link names as checkpoints for successful image handling. Change-Id: I1e99e515e18ba1dec534c520811c127b2b528afe Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5878c5c0c2ca8c78e9a5124452eefe8290ab63cd)
2018-01-08Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "add container4nfv job to upload artifacts" - add container4nfv job to upload artifacts Change-Id: I16592831a5382bbcad8bec27d0070608381a7061 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
2018-01-08Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Use local repository for docker build" - Use local repository for docker build Change-Id: I789aa64f0f5443aee5178f98ce36e07f3b786c15
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump for missing delay after `kpartx -av` Change-Id: I94f6a562035f4b35187d8354db4cdb322018fa93 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - lib.sh: Add delay after `kpartx -av` On rare occassions, mapper bindings created by kpartx take longer to show up, leading to errors when we try to mount them on. Bring back the hardcoded delay to bypass such issues. Change-Id: Ib386c04fc55cd85235a2156dba08fda378e4cdfd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6b0d21a70be04666fd60a9d4b05d4ad13e192026)
2018-01-08Update git submoduleschenjiankun1-0/+0
* Update docs/submodules/yardstick from branch 'stable/euphrates' - Bugfix: failed to generete gui files in stable/euphrates in CI JIRA: YARDSTICK-898 Now the gui files failed to build in stable branch in CI. (local work, CI master work, CI stable not work). The reason is stable using ubuntu 14.04 and the nodejs version is 0.10.25. We need to update it. Change-Id: I15b9efb91eb6fc1e3245cf827c130d408034eae5 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for Ubuntu `modprobe -f` fix Squash in additional changes: - p/fuel: Retry armband state, fail on not connected - u/fuel: Bump & rebase for wait_for changes While at it, catch armband state minion timeout (not connected or no response) and reduce armband state retry from 10 to 5. We no longer expect the armband state to fail on any nodes, baremetal or virtual, kvm or cmp, so remove failsafe `|| true` and retry state apply in case minions did not repond. JIRA: ARMBAND-350 Change-Id: I7b4302a89d60c94ab3f58cd6b8523cf668314a05 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 6eab8c989c257213586347f284362cc43f99d3f4) (cherry picked from commmit 29c39fd5a8fc8a4bb058b5c18a6c1d6a29544f4f)
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - lib.sh: Fix `modprobe -f` on Ubuntu For some reason, `modprobe -f` for a clean nbd module (from vanilla Ubuntu) fails with exec format error randomly, while a simple `modprobe` works. Change-Id: I79785e510cab757e2482baf442054be984c24019 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 510a5fe446dea8513060813794c99e856eff1845)
2018-01-08Update git submodulestomsou1-0/+0
* Update docs/submodules/sdnvpn from branch 'stable/euphrates' - Fix instance boot when metadata exists The way that a instance is considered as UP is pretty strict and returns ERROR in case of instances with userdata This patch differentiates the instances that are supposed to boot till login prompt and those with userdata parameter JIRA: SDNVPN-177 Change-Id: Ic4755366df006669475c90cc0693ac802256f379 Signed-off-by: tomsou <soth@intracom-telecom.com> (cherry picked from commit a6e207c16430055eba8bcc8586b09a7081db3d04)
2018-01-08Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Prepare integration of daisy and dovetail" - Prepare integration of daisy and dovetail JARA: DAISY-76 1. add daisy adapter in releng utils and modules 2. add daisy adapter in dovetail jjb script 3. support id_dsa as ssh key Change-Id: I15a1c0cfcc17ae1fe6b7020f674b8bbbb72f4a7a Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-08Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - lib.sh: Fix stop condition in wait_for Change-Id: Ida693b6dd328db283d6992ac33500f4dd1a73eb8 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 717cb4e0f8d9e430eb31ba643f95682f1592e509) - salt.sh: Fix linux state apply on cfg01 cfg01 does not repond or is not connected while trying to apply linux state via salt.sh, use wait_for macro to account for this. JIRA: ARMBAND-315 Change-Id: I2d4c63d43f806b65f9ce327f4a00a6334be88750 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry-picked from commit 2bbab1873ef629e89ac92ec195feb15b86cf8295) - lib.sh: Extend wait_for function to catch no resp wait_for function should be able to also check for minions that did not return or not respond, in addition to the return code. To keep it backwards compatible, condition the new check on the max attempt number being specified in decimal format (e.g. '10.0' unlike old '10'). Change-Id: If2512cf9121cdd795638efe7362ef0485d4e8d91 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 3f559299c232bbb7639d02243c95d6256cdf94d4) - MaaS: Set commission/deploy timeouts via reclass Allow end-users to easily change the MaaS commissioning/deploying timeouts by simply editing the reclass model. While at it, use arch-specific values and bump deploy timeout on AArch64 to 20 minutes instead of 15. Change-Id: I37ae434ecebdd64effb007baa06c722b1db15c66 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit ea6ecbb6fb546e27fcc73e699e08c6cad31d2bd0) - x86_64: Revert base, VCP kernel to 4.4/4.8 Commit 7bfb0ac switched both base and VCP images to using Ubuntu kernel hwe-16.04-edge (4.13.x). Due to testing suites compatibility issues, switch back to: - default Xenial kernel (4.4.x) for base image; - hwe-16.04 (4.8.x) for VCP image (similar to Mirantis image); Fixes: 7bfb0ac Change-Id: I458c42124efa6eda765774fe05cab402d6111f82 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - user-data.template: Remove salt-minion install salt-minion is now pre-provisioned inside the image using qemu-nbd. Revert "lib.sh: Limit envsubst to certain variables" This reverts commit 3a76d07dbd409b781abdb8520f55a1b20edf07db. Change-Id: Icceb8bcf439e28ab01c7731c3602c1113290454d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fac41836e91dd56696c3a435bfdbc7adf53899e2)
2018-01-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - lib.sh: Cache base image(s) between deploys Fingerprint and re-use base image artifacts. Change-Id: Ic7a73c04e27d25addd50e4e9880619a0028956d3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1815bdaf0c1765cc1fcb48031f8291409861b0b2)
2018-01-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - deploy.sh: Print sysinfo JIRA: FUEL-323 Change-Id: I0dcbcfbedc7e9ef013ca50dcc08f804323f91701 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 3aa172fb1659925a837b432649793f9f1f46cca9)
2018-01-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for mas01 NAT restore Bring back NAT on mas01 for testing suites. Change-Id: I415016f4b7249ef35fd4e75acd9ab92a2574e765 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Revert "[baremetal] Retire mas01 NAT" Although deploy works now without direct internet access on the cluster nodes, testing suites seem to require it. This reverts commit ed209426e895c7c323d253afd6276bb74df64da0. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Change-Id: I35489e18fdd6a4ee6a270e42a3542e5a370bf819
2018-01-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for MaaS prx et al Change-Id: Ib2fa3af6c1336ad31868a812abe2b8257f69895c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - MaaS: preseed Armband repo via curtin Instead of installing upstream vanilla kernel from Ubuntu just to upgrade to the one from Armband repo later, preseed Armband repo config via curtin. This allows us to drop a kernel update cycle, thus saving a few minutes at each deploy. While at it, switch salt repo addition to use the maas region reclass section instead of adding a dedicated mechanism for it in the curtin template (only for arm64). [ stable/ euphrates ] Preseed all Armband repos, since Ocata does not have a "common" repo. JIRA: ARMBAND-280 Change-Id: Iad5953a7de80d728f11a4ce3113bd7725100c31c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 648ec98613d31e3d9701b9ac1d87aed640b245f3)
2018-01-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - Merge "[baremetal] ODL: Move ODL VCP VM to kvm02" into stable/euphrates - [baremetal] ODL: Move ODL VCP VM to kvm02 Balance VM distribution on the 3 kvm nodes, as kvm02 has 4 VCP VMs while kvm{01,03} have 5 VCP VMs each (without ODL). Instead of spawning the ODL VCP VM on kvm03, move it to kvm02. Change-Id: Id03b9453ee7c15cd6785c0bc073a38b87034aede Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 62135fd2367ced881bf99dc157fdb4536633d4a0)
2018-01-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - deploy.sh: Silence cleanup output Cleanup sequence might print some warnings/errors that are misleading for new users, so let's silence them. While at it, remove unused `cleanup` function stub. Change-Id: Ic4225f7d4b701cd15d96e1bfc5eecfe2c4291eb6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 84f131b32ac510097c3aac321fb1ca67bafc8941)
2018-01-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [baremetal] Fix Pike reference, should be Ocata Change-Id: Ifb5216818f67f859d55ccf253eb84101cac0dab4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [centos jump] nbd build: Fix REQ_TYPE_SPECIAL Change-Id: Ia514418d2aae1b4f7e752d4610fa6c9829c67e51 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 84f58189f269be6633e0c8897d5624d3dfaaa650) - [centos jump] Add nbd build support RHEL distros do not maintain nbd, so add a best-effort function to build it on the fly. Change-Id: Ie0419f0fed8a0b12f6b878b3093d6ca34f72d140 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 924d481ac84e8fad9bf1132e1cff18967887017e)
2018-01-04Update git submodulesAric Gardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Use pharos repo in daisy master branch" - Use pharos repo in daisy master branch There are no PDFs in euphrates branch of pharos repo. Securedlab is still used in euphrates branch. In master branch, pharos repo will be used. Change-Id: Ifbdeed26f938025aae56d2d263abf3d8620b31ba Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
2018-01-04Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [baremetal] Switch VCP base image to UCA Since Mirantis prebuilt image comes with salt-minion 2016.3 instead of 2016.11 and upgrading it leads to a hard to break catch-22, use the Ubuntu cloud archive image we already download for FN VMs and pre-install: - a newer kernel (hwe-edge); - salt-minion (2016.11); This also implicitly aligns the image handling on AArch64 and x86_64. Change-Id: I86d1c777449d37bdd0348936a598e3ffe9d265af Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f37103b4d60f057f653e0e5e8b7c6c3023a95b2d) - deploy.sh: Fix missing space in dependencies list Change-Id: I4d41ff8b9f7c1b59a2c1a400b9335f17b8c542be Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4d4149faa5604836931c039ad1922f95a764bb76) - deploy.sh: Factor out pkg deps into yaml files Instead of hardcoding the packages to install on the jumphost at deploy time in `ci/deploy.sh`, move the requirements list to a dedicated yaml file, so it is decoupled from actual code. While at it, add missing deps: - ipxe-qemu (AArch64 Ubuntu only); Change-Id: I9ee5c0796b70f9d29427d608b6415333c8841e1e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b57cd65121f61114432b07c04106fc4b8609440e) - base image: Explicitly call kpartx qemu-nbd currently available in CentOS 7 does not add partition mappings automatically for NBD devices, so add explicit `kpartx` calls. Change-Id: Ifa79c89b82024602b782c449dbf4de10899e03b5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5c890d60fff57b624358f4d4be6865862f4f8415) - AArch64: base image: pre-install salt-minion While at it, rename apt repo in foundation node user-data template from "salt" to "saltstack", to align with reclass model naming. Change-Id: I5b216492349ae187b568884b1ab4046c52b1c6b2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit feb877785544a31a18ae2f0ee2900a82e7ac4337) - Add pre-{install,purge} support for base image Extend <lib.sh> and its invocation from <ci.deploy.sh> with support for modifying foundation node VMs base image prior to using it with: - additional APT GPG keys; - additional APT repos; - packages to pre-install; - packages to pre-remove; - (non-configurable) cloud init datasource via NoCloud only, so VCP VMs won't wait for metadata service; While at it, re-use the resulting image as a base for another round of pre-patching (same operations as above are supported) to provide a base image for VCP VMs. Add AArch64-specific configuration based on new mechanisms: - pre-install linux-image-generic-hwe-16.04-edge (and headers) for foundation node and VCP (common) image (also requires new repo and its key); - pre-install cloud-init for VCP image (it should already be installed, but script needs non-empty config for VCP to create the VCP image and transfer it over to Salt Master); NOTE: cloud-init is required on VCP VMs for DHCP on 1st iface. JIRA: FUEL-309 Change-Id: I7dcaf0ffd9c57009133c6d339496ec831ab14375 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6ead32f737f39e3d82e1484a9d31f07ed2daeadb)
2018-01-04Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: Adds os-odl-bgpvpn-noha to daily Change-Id: I92b3c2fce51dad5e0e00b836a41af40f845e701e Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-01-04Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'stable/euphrates' - Inject all envs in openrc into CONST After "env_prepare" is removed, some specific vars in openrc (eg,."EXTERNAL_NETWORK") loaded to os.environ should be injected into CONST in one python process. Conflicts: functest/ci/run_tests.py Change-Id: Iaa5c6047033dc2a30c533174e2016111759aec31 Signed-off-by: Linda Wang <wangwulin@huawei.com> (cherry picked from commit 6a2ee8883daf1795ec84fc2868c17c0723025447)
2018-01-04Update git submodulesxudan1-0/+0
* Update docs/submodules/releng from branch 'master' - Get fuel controller ip for HA test cases The releng module 'deployment' doesn't work for fuel euphrates and master. Use commands to get one controller ip for HA test cases. Since the public endpoint url may be v2, reset openstack authentic file for v2 Change-Id: I3c6ec1f0890c93f75ca3c7c9801e05da329ffdae Signed-off-by: xudan <xudan16@huawei.com>
2018-01-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [baremetal] Move include.proxy yml to proper dir Change-Id: Id46b454b224dacdbaf675155c949d0998f0d0036 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [baremetal] curtin: Bump salt-minion to 2016.11 By default, MaaS formula will install Salt minion 2016.3 via curtin on physical nodes. 2016.3 does not properly support proxy_host config option, causing timeouts during `linux.system.repo` SLS apply. Change-Id: I3d6245f0d4b425170c43b3b62a21ad9acc6cb97e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6e0e518d43cecfb8f981dbd51326d8eae103720c)
2018-01-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - [baremetal] Retire mas01 NAT Isolate networks by retiring NAT on mas01; also cutting direct internet access from cluster nodes that are not facing the public network (prx, cmp). NOTE: Since we are removing mas01 NAT, VCP VMs (except prx which have public IPs) and kvm nodes (cmp also have public IPs) will no longer have direct internet connectivity. Cluster deployment and operations will work without it, but if it is required for different reasons, the MaaS proxy could be enabled by uncommenting the /etc/enviroment section in: - cluster.baremetal-mcp-pike-common-ha.include.proxy.yml JIRA: FUEL-317 Change-Id: I5ed8b420296b27df34a54ec1ebd7b7cf58041425 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 9a6e655e0b851ff6e449027c01ac1a66188b0064) - [patch] Fix OVS ifup workaround Do not assume routes are on the same OVS port as the one currently being configured. Instead, apply the `unless` ifup condition for any OVS port. Change-Id: Iea8084f9e50401d300feb7ed16f90b430680cac5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b1849f630a8de3dfce2e91fc375d9e901b90843b) - [baremetal] heat: Switch metadata API URL to mgmt Prepare for decoupling management from public (drop mas01 NAT): - ctl: change heat URLs to use new management VIP instead of public; Change-Id: I8e220ee37bd4177c3afd58a9ee401f815d046706 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d39aaa2b7312c91e6a1851f357cf1d087619cbda) - [baremetal] prx: Add management network VIP Include `openstack_web_public_vip` class for setting up the old VIP in the public network, use old class for mgmt VIP. Also change the generic hostname 'prx' to point inside mgmt net. Change-Id: Iff69394f16ede290d149a26b054a85371f00f8e0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 29c64b73f749364867be78a474410fe062eba99e) - docs: diagrams: Add PXE/admin on cfg01 Refresh diagrams to reflect that the internal network is not used anymore on jumpserver after PXE/admin was hooked to cfg01. Change-Id: I4c162d59824e182bc76c0a395742050544e95291 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit bb3a642e783b59ae2decb3b73d91f5bfca3afaef) - [baremetal] MaaS: Enable HTTP proxy Instead of using NAT on the mas01 node for all cluster node outgoing traffic, use the MaaS built-in proxy for APT traffic to leverage its caching capabilities too. Also enable the proxy for salt minions, so they can access public keyservers et al. Cleanup public DNS from kvm nodes, interferes with MaaS proxy. Add example config for global env proxy, but don't enable it: - default environment settings - /etc/environment (via reclass); The MaaS proxy will not be used (at least for now) on nodes: - cfg01; - mas01; NOTE: We can't yet drop the maas.pxe_nat state completely, as certain Openstack services are still accessed via public addresses from ctl nodes. JIRA: FUEL-317 JIRA: FUEL-318 Change-Id: I6c5f6872bb94afb838580571080e808bc262fc68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 90c0b369c01a2185fe86651f8ad9e0a172d6941d) - [baremetal] cmp: Add missing public gw (default) When we dropped the default gw via mas01 NAT, we uncovered a bug, compute nodes do not have the proper public gw set up and used to reach public network via mas01, slowing everything down. Add gw similar to prx nodes. Fixes: d4ab072 Change-Id: I4343c31c376a7a223670cdd623366454396d8d92 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e9d597db3a9e8a38577908f36f5f700e875d4d78) - [maas] artifact sync: improve barrier condition Simplify wait condition for MaaS service up, since it's fragile and often adds extra time when not really needed. Instead, retry starting boot image import right away. Change-Id: I131d6c82127449cecf6685d4cc7484a366e658c6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit fedeebd6ee0e3a342777812b7ea90bd4988787ad) - [vcp] Catch 'no response' of salt minion as well Salt minion could return 'no response' and cause an unconfigured state of the vcp node(s), so catch this output after linux state as well. Also clean up excess route on proxy nodes. Change-Id: I3183fa09ff41a8f027ee789869bdae0c3962ab8f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commmit a183db4b3404bd12073b5691eb5d4fbd8135b44b) - [maas] Set edge hwe kernel as a default minimum Change-Id: I360dcb675c90b6f20687979ebc493afe6682c821 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 8494ec245aa24f00f2412d0f9d1e1e32591708d7) - [baremetal] Move salt master IP to PXE/admin Use PXE/admin network for salt traffic from/to all minions except cfg01, mas01. This allows us to drop the route to admin net from cfg01. Change-Id: Ic2526f1ff77afe5d92ced900971f4c8f78d2d8a2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d4ab072aeab143ce72e4b81122d4580915a4ad1a) - Move VCP iface config to own yml - move linux.network.interface definitions to their own classes, which also removes the previous requirement of defining {dhcp,single}_nic parameters in classes that don't actually use them; - drop now useless {dhcp,single}_nic parameters; - expand linux_{dhcp,single}_interface macros, since they cause issues with reclass dict-merge while attempting to override sub-vars (i.e. it's not possible to set 'enabled: false' via reclass interpolation); JIRA: FUEL-310 Change-Id: I29d921f545e761de335a60e242a4523d13b06c78 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 2fc4b8890ef1ad456ac1ff421f33e005ae0484be) - PDF: reclass: Rename template file suffix to _pdf Init is a generic suffix which also collides with pre-existing files. A distinct suffix (e.g. _pdf) should be used. JIRA: FUEL-310 Change-Id: I919a5394e7ff432ee86d10bafe889aeadb181649 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit fda7372a1bffe11fc7a199ad3d4344c1b9e57e57) - states: Rename openstack, add baremetal_init To align with new cluster naming convention, rename 'openstack' state file to 'openstack_noha'. While at it, factor out baremetal setup from 'virtual_control_plane' into a new state that will be reused in upcoming scenarios, remove useless sync_all (automatically done after node reboot). FUEL-310 Change-Id: I6d7e5db8f09305f2fd8eeca0199a2e85b08d2202 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 52e37b795bb975b1cb3bf1f684b009848c50a2d6) - baremetal: openstack_proxy: Rename iface dicts Later we will want to merge multiple openstack_* classes, which would try to merge the 'single', 'dhcp' interface definitions and fail due to mismstached types (proxy has 'dict' types while the rest do not). Let's rename the proxy iface definitions to prevent that. JIRA: FUEL-310 Change-Id: I1be18ddbbeae1bb3ee6de9bd783ee57b185cd477 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 93b36a416f9e5f4e8828ec9544ded29f1bb82098) - baremetal: Use common database_init, control_init While at it, delete unused haproxy_openstack_api. JIRA: FUEL-310 Change-Id: I01953b01624fe3e9da8074239d20056f3762efc7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6641403cbe2aaaaf61c2aecef4ec251f327ebee0) - Rename reclass models to add "-ha" or "-noha" Parse all reclass j2 templates, not only common + current scenario (useful when adding new scenarios later). JIRA: FUEL-310 Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 09dce2a2643223d66aa1ac3a0ad8feebc082f521) - [baremetal] MaaS: Fix DHCP dynamic range (2) - reduce range to silence bogus MaaS warning about address exhaustion; - regenerate pod_config.yml.example to reflect the changes; - drop `opnfv_infra_maas_pxe_address` (duplicate of `opnfv_infra_maas_node01_deploy_address`); - add `opnfv_infra_config_pxe_address` for future usage; JIRA: FUEL-316 Change-Id: I981fc8c7c550c2917b07dd5f2c83896def013fa7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 215a37d55356333f9fd0a96118c9a00d588eca62) - [maas] Adjust deployment order/timeouts Change-Id: I9dbb51ce2387450e4ae19f8b3444f5e52cfdc71d Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry-picked from commit 52bd5a8f6c5b27ec3070625a51aea8ff85f5a8db) - [baremetal] MaaS: Reduce timeout values `maas_fixup` is already re-entrant, so we can execute it more than once during a commissioning/deploy cycle. Reduce the timeout waiting for all nodes to reach a stable state, so nodes stuck in 'Ready' state instead of reaching 'Deploying' get dealt with sooner (~5 min vs old 30 min). While at it, let `maas_fixup` handle machine deploy as well, so we can catch nodes stuck in 'Ready' state and re-trigger the deploy. Change-Id: Id24cc97b17489835c5846288639a9a6032bd320a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8da73521d3b9347a982ea6e77114bba0d0f0adeb) - salt.sh: Use salt-call to apply linux sls on cfg01 Also, retry applying linux high state up to twice, due to rare spurious failures with 'No reponse' status. Change-Id: Ic7839a5c9501673cb127412136afb91e05f87a7e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commmit 4509936347b429fb36a27844a63d808f057fd61e) - [baremetal] Move all MaaS PXE net config to PDF - s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars; - patches: pharos: Add MaaS PXE network to installer adapter; - runtime.yml{,.template}: move to installer adapter, update pod_config.yml example; - drop MAAS_PXE_NETWORK global env var, now read strictly from PDF; JIRA: FUEL-313 Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 15e982f0d00dbcc72be2f5b25dab34b3f3efd912) - patches: Squash maas region changes When re-deploying with `-f` flag, `patch -R` cannot cleanly revert maas region changes with overlapping context lines, so squash them into a single file. Change-Id: I87dae72a12fea833e9e6729de21d4ce5f262695e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit d68bdf31c1c7d2d29f3524915f6a347f8d0567f5) - [netconfig] APT: Prefer ipv4 connections over ipv6 Ubuntu prefers ipv6 connections therefore in some networks, this breaks software updates (it does a AAAA DNS lookup before A record lookups). Let's prefer old style ipv4 connections over the new ipv6 in order to save some processing and resource utilization. Based on previous work from [1] (but without /etc/gai.conf, only APT). [1] https://review.openstack.org/#/c/462502/ JIRA: FUEL-321 Change-Id: Ic3dff3baa1c0be9ac95972557d6a2d26641bfe1b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4d604967adde375eb24ae165aff83c11be89ca30) - ci/deploy.sh: maas: cleanup_uefi on env erase Running `ci/deploy.sh -EE` should also perform an UEFI boot option cleanup, otherwise we risk booting the previously installed OS. While at it, reduce delay between nodes removal and fix a rare failure for `-EE` when no nodes are defined in MaaS. Change-Id: I789ffd3e22545921216f7d5ee3509c76354542eb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 15173a83dba08729e62da277b9165677323675d8)
2018-01-03Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - p/fuel: Backport base image explicit kpartx Change-Id: I458406fa9361a44b29f52c5840d579328257ee5e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-01-03Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Bugfix: Lack of DEPLOY_TYPE" - Bugfix: Lack of DEPLOY_TYPE Set the value of DEPLOY_TYPE according to BUILG_TAG Change-Id: I08e720dc6e049c54e249172503bcbdb7c314dc6d Signed-off-by: xudan <xudan16@huawei.com>
2018-01-02Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/releng from branch 'master' - Apex: disable Euphrates daily Change-Id: I7b10ac19a8844832886e6a54d065ee79dde026d0 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-01-02Update git submodulesxudan1-0/+0
* Update docs/submodules/releng from branch 'master' - Bugfix: use fuel public endpoint rather than internal one 1. The internal endpoint url of fuel is http. 2. Dovetail won't pass cacert to functest and yardstick containers if it's http. 3. For functest and rally, even if it uses internal url in the openrc file, they will still use public one somewhere. 4. Use fuel public endpoint which is https, so all containers will work with the cacert. Change-Id: I3326c8d66bcad44ea81169ce0938cb0e247f498c Signed-off-by: xudan <xudan16@huawei.com>
2018-01-02Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'stable/euphrates' - Bug fix for offline deployment of euphrates branch JIRA: - For offline deployment, there is no need to fix the pandas and python-ldap version. Change-Id: I30fa1f2af8ad13e115c0078c4f33102936bdd71d Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2017-12-30Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - u/fuel: Bump & rebase for apt-mk '2017.12' dist Change-Id: I2ab66e4c3eff1d5e1423df9201698a13cf9b345d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-30Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/euphrates' - salt: Use apt-mk '2017.12' distribution 'nightly' repo dist from apt-mk is broken, so switch to '2017.12'. Change-Id: Ie12dfc2a499910b8b98a63886ba16044e66435f5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-12-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - Makefile: Fix `make upgrade` from same branch Change-Id: I01d583995e0b557ec128111a3f5ff56684d9fb36 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 4eef836a99cd8c3c64e27adcb1e17ec5dc588116)
2017-12-29Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/euphrates' - Makefile: Add `make upgrade` target 1. Fix missing default `make` target for `all` 2. `make submodules-clean` should checkout git submodule commit On patch apply, we tag the starting commit, so we can later export as patches all commits between that reference and another tag, applied simmetrically at the end of the patch apply process. Previously, `submodules-clean` checked out that starting tag. Change that behavior to use the commit ID referenced by parent git repo (armband) submodule, so when armband git submodules are updated (e.g. sometimes `make upgrade` might include such changes), the new reference will be picked up automatically. 3. Add `make upgrade` for fetching latest changes on current branch Change-Id: I03dc3953e91acfbe6ccb5e3bb2ccee7d28a0f7d5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 74238bffbde967b83a6c9db762caf8a18430dcd2)
2017-12-29Update git submodulesxudan1-0/+0
* Update docs/submodules/releng from branch 'master' - Support run dovetail CI jobs on fuel euphrates and master Change-Id: Iaf64316f8db351dd72f1ec1079953764f797dc3b Signed-off-by: xudan <xudan16@huawei.com>
2017-12-28Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'stable/euphrates' - Clean base images only if 1 container was built Conflicts: build.sh Change-Id: I0134082d2d150a6dc58e679f9ade81eb6c040266 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 20d22666aa841f0128b3f53a07ba0f31684537d8)
2017-12-28Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Use Dovetail aarch64 docker image with armband pod" - Use Dovetail aarch64 docker image with armband pod Change-Id: I8ce34880b78daaaf0bf22674d26e1d8f8f41614c Signed-off-by: xudan <xudan16@huawei.com>
2017-12-28Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Enable dovetail daily jobs on Fuel/armband Euphrates and master" - Enable dovetail daily jobs on Fuel/armband Euphrates and master Dovetail only ran against fuel danube release before. It needs to run against fuel euphrates and master because Dovetail team is planning the 2nd release which is based on OPNFV Euphrates. Change-Id: I2c39d53a16ca6dbf8eda31943f09896cf7ee35c6 Signed-off-by: xudan <xudan16@huawei.com>
2017-12-28Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa to compass-tasks. And create a new docker image compass-tasks-base" - [compass4nfv] merge the docker image compass-tasks-k8s and compass-tasks-osa to compass-tasks. And create a new docker image compass-tasks-base Change-Id: I3a6f38ce28fe465cf1c2c1723a41728a7cbcc60d Signed-off-by: wutianwei <wutianwei1@huawei.com>
2017-12-27Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'stable/euphrates' - Clean Docker images after builds Compared to the related Releng script, it only focuses on cleaning images. It's considered out of scope to remove remaining docker containers. It doesn't force to remove images because base images (e.g. Alpine) could be selected by other OPNFV projects too. It ensures O is returned even if one image cannot be removed. functest-core is removed at the end because all Functest containers depend on it. The script works well in a nominal building env. Any remaining Functest images or containers must be removed by hand. Conflicts: build.sh JIRA: FUNCTEST-898 Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com> Change-Id: I72d8214b711680ec7958af1d427b23dee6337bf6 Signed-off-by: Jose Lausuch <jalausuch@suse.com> Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 98a942469134fcc3f91b6658a6fbb256d9d89518)
2017-12-26Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/releng from branch 'master' - Allow building docker image from specified path Change-Id: Iab40fc2c719050d36a614fe529ca22634b59b7bc Signed-off-by: Yujun Zhang <zhangyujun@gmail.com>