summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-02-07Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Temporary disable one unstable snaps test Else all verify jobs are failing [1] [1] https://jira.opnfv.org/browse/SNAPS-263 Change-Id: Ic2dca7f2387af1f98d3720b8db05dc3ccd54098c Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[virtual] Rename all to drop virtual prefix" - [virtual] Rename all to drop virtual prefix JIRA: FUEL-322 Change-Id: I99c4b1774a7c3afbc834a6f6e8468f7baf1bc329 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[hybrid] Merge config/scenario/{baremetal,virtual}" - [hybrid] Merge config/scenario/{baremetal,virtual} Instead of classifying scenarios by underlying machine type, switch to HA/NOHA differentiantion only. This allows us to add support for hybrid scenarios (with some virtual and some baremetal nodes in the same cluster). To facilitate this, we will template the scenario files, which is a small step towards SDF (Scenario Descriptor File) definition and adoption later. JIRA: FUEL-338 Change-Id: If5787991869a3105d82c27ffa0a86ac79b4b08ba Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[states] maas, vcp: Use `wait_for` in online check" - [states] maas, vcp: Use `wait_for` in online check Change-Id: I7b583c354843f0116a65b3a31f3be4589087b8a5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "Add NOVCP HA OVS scenario (baremetal, virtual)" - Add NOVCP HA OVS scenario (baremetal, virtual) Add a new class of scenarios, based on existing baremetal HA scenarios, but instead of having a virtualized control plane (VCP), all Openstack controller services will run directly on the cluster nodes. This change adds the common scaffolding, as well as the OVS scenario. The new scenario(s) can be used on full-baremetal clusters, soon on full-virtual clusters and later on hybrid (virt + bare) clusters. This change defines old (current) style scenario definitions for both baremetal and virtual, both named: - os-nosdn-nofeature-novcp-ha; Prerequisites: 1. Merge-able by name reclass.storage.node definitions Each cluster (e.g. database, telemetry) adds its own set of reclass storage node defitions, which for novcp scenarios should be merged into a single node (kvm) based on the 'name' property. This is not currently supported by upstream reclass 'node.sls' high state, so add support for it via an early patch (required before salt-master-init.sh tries to handle reclass.storage). 2. common reclass classes for novcp Some of the classes in `baremetal-...-common-ha` are not fit for novcp as they define VCP-specific config/inheritance, so add new versions of said classes with novcp in mind or adapt old classes: - parameterize ctl hostname in `openstack_compute.yml`; - new `openstack_control_novcp.yml`; - new `openstack_init_novcp.yml`; 3. Handle hard set names in state files for baremetal nodes Some of our state files (e.g. maas) hardcodes baremetal node names to 'kvm', 'cmp', so we need to align the names in novcp scenario with these values to re-use the maas state. As a future improvement we should parameterize these names in all state files. As a consequence, our baremetal controller nodes will also use 'kvm*' hostnames (instead of 'ctl*'). 4. Add 'noifupdown' to all interfaces on kvm nodes to prevent duplicate IPs/routes created at *any* ifup due to /etc/network/route-br-ex. Patch salt-formula-linux to skip network restart on 'noifupdown', also when routes are present on that interface. JIRA: FUEL-310 Change-Id: Ic67778f63e5ee0334dbfe9547c7109ec1a938d61 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Switch off broken sphinx state Deactivate documentation related optional state until it get fixed in upstream. Change-Id: I5242ed307548c4f37f81d271a1f4f6bee9903f4e Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-02-07Update git submodulesTim Irnich1-0/+0
* Update docs/submodules/sdnvpn from branch 'master' - Updating INFO file - new PTL Updating project lead and primary contact to Peri after PTL election. Change-Id: Ief833e2e1479f99f8f0be815d5be43cb96883a4a Signed-off-by: Tim Irnich <tim.irnich@ericsson.com>
2018-02-07Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Remove dns server from juju_epc config The dns server shoud be set by the Cloud provider via Neutron configs. Snaps is currently enforcing 8.8.8.8 as default too. Change-Id: I3e9a25d8bbfbab4cd1d44e394235b329df86e82e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-07Update git submodulesyayogev1-0/+0
* Update docs/submodules/calipso from branch 'master' - bug fix: verify.sh returned value based on last command only Change-Id: Icf701eee60da7c27c62b9a2871c4f9896b8f334e Signed-off-by: yayogev <yaronyogev@gmail.com>
2018-02-07Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge changes from topic 'fix-public-bridge' * changes: [virtual] Add missing ODL dhcp_int [virsh net] public: rm addr cfg for pure baremetal - [virtual] Add missing ODL dhcp_int - add missing network definitions for ODL node's 1st interface; - add missing comments for `notify` global functions; - fix or silence shellcheck issues; JIRA: FUEL-322 Change-Id: Ie3341d29ab12ddf432db603ad865259afb54714e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [virsh net] public: rm addr cfg for pure baremetal To prevent adding a gratuitous requirement on public being a real Linux bridge on the jumpserver when baremetal nodes are present, stop configuring any IP address information for the public virsh network, allowing us to keep mocking it like we did before L3 information was read from IDF. JIRA: FUEL-339 Change-Id: Id09ecac14825a80a0770c5969afad79b0235e08e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[baremetal] cleanup: rm cloud-init iface config" - [baremetal] cleanup: rm cloud-init iface config Upstream commit [1] now handles cloud init interface configuration cleanup, so drop our explicit config from reclass. [1] https://github.com/salt-formulas/salt-formula-linux/commit/b333d284 Change-Id: Ifd624f1e884d0d884513a3a7c3e18ffe3f00949a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesMarkos Chandras1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - Merge "xci: scripts: vm: Use LVM backend if available" - xci: scripts: vm: Use LVM backend if available The CI nodes come with a big secondary mechanical disk which can be attached directly to the clean VM. As such, we split the disk into one logical volume per distribution and flush the qcow2 image to it before attaching it to the VM. If the XCI volume group is not available, then we revert back to using a file-based storage backend. Finally, we hide stdout/stderr from the package installation process to minimize the script output. Change-Id: I11ea82899c411f8a4168e5f23cbbd8187cc891df Signed-off-by: Markos Chandras <mchandras@suse.de>
2018-02-07Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [HA] Use cluster_public_host for SSL cert fetch For VCP-enabled scenarios, `cluster_public_host` and `cluster_vip_address` both point to the public VIP of the cluster. However, for upcoming NOVCP scenarios, `cluster_vip_address` resides inside the management segment, so use `cluster_public_host` instead. JIRA: FUEL-310 Change-Id: I13ef482e2c3116c991dfe91be81d0964f140f8e9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-07Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Disable orchestra_* testcases" - Disable orchestra_* testcases They can be simply disabled and they unsuccessfully run vs Daily only. In a second step, moving the related python modules in a new orchestra repository could be a good solution simply because they don't reach our coding criteria. The best way is still to update them according to our rules and to check all installers thanks to these two vnfs. Change-Id: If36b16f0ed95d7039db9455a32c18f7fd1a739ef Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-06Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixed timeout logic when attaching/detaching volumes." - Fixed timeout logic when attaching/detaching volumes. The timeout logic in nova_utils.attach_volume() and detach_volume() was not correct which may have been the root cause behind the issue FUNCTEST-927. Timeout in both attach and detach is no longer optional. Also added a test to attach and detach without timeout as that path was never tested. Updated associated test documentation as well. JIRA: SNAPS-263 JIRA: FUNCTEST-927 Change-Id: Iea3aeab59c378917fbd175d673113e8d30e2e4b9 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-02-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "[apt-mk] Switch back to nightly" - [apt-mk] Switch back to nightly Revert "salt: Use apt-mk 'stable' distribution" Revert "reclass: apt_mk_version: stable" This reverts commit d1b6119e288a31e015573363ce77790fec8684df. This reverts commit 4563ea7d62238e8273d840a8d9c6c1e179ca584e. Change-Id: I383db1f78a087045086096cbc674260b985fd913 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [Horizon] Limit css fixup to Ubuntu package Horizon package from Mirantis mcp-repos does not require the fixup, so limit its application to non-mcp packages. Required for upcoming NOVCP scenarios, where we also have mcp-repos APT source on the proxy nodes. JIRA: FUEL-324 JIRA: FUEL-310 Change-Id: I4399af803c0a17e0aa8f3d7a7330e501a5eedf55 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-06Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - lib.sh: modprobe br_netfilter, don't bail on err Some sysadmins or distro defaults might blacklist br_netfilter, or it might not be loaded at deploy start, account for these corner cases too. JIRA: FUEL-334 Change-Id: I3ca6cb3848df8d2af1625ff4e3816efe8b320886 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-06Update git submodulesRodolfo Alonso Hernandez1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Adding three missing test case descriptions" - Adding three missing test case descriptions HA tests TC056, TC057 and TC058 are missing from Yardstick test case list. Missing white space added to tc056.rst. Change-Id: Id56a22ad96af8c3d05d95fb58259e9683ce9fab0 Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
2018-02-06Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix rally cinder volume attach scenarios Add network id to following scenarios: CinderVolumes.create_snapshot_and_attach_volume CinderVolumes.create_nested_snapshots_and_attach_volume JIRA: FUNCTEST-929 Change-Id: If95babebf9ea6205684494395bdfd72d5203f4bf Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2018-02-06Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/sfc from branch 'master' - Define the timethis function in the sfc repo Functest removed the function from their repo, so we need to define it in ours: Change-Id: Ica122e57612c38751d8ff810f3ba61b749e867eb Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-02-06Update git submodulesManuel Buil1-0/+0
* Update docs/submodules/sfc from branch 'master' - Update the vnffg templates The following tacker patch: https://review.openstack.org/#/c/532203/ changed the syntax of the vnffgd templates Change-Id: Ifbf788b02a95c8f45eb97230d3d2da117de158d6 Signed-off-by: Manuel Buil <mbuil@suse.com>
2018-02-06Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng-xci from branch 'master' - bifrost: Bump bifrost sha1s to latest on master This change brings in the fix for policy.json removal. https://review.openstack.org/#/c/536349/ Change-Id: Ib18a99502c0ce61278e13f25a01622e073749d14 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-06Update git submodulesCristina Pauna1-0/+0
* Update docs/submodules/armband from branch 'master' - [docs] Remove redundant information Armband and fuel documentation have been the same for E release. Instead of duplicating everyhting, make references to Fuel from armband docs. I removed the scenario folder as it should not have been here in the first place, otherwise the folder structure is kept as is. JIRA: ARMBAND-357 Change-Id: I060f22aee60713cabfd09ccf2fc0201e68a03c2a Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
2018-02-06Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - xci: Disable voting for CentOS jobs CentOS jobs started failing which requires troubleshooting. In order not to block things, the voting is disabled for CentOS jobs. Change-Id: Idc14b00cf09f0ee75bac17e993dc9f7724a1ad88 Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Bug fix for tacker installation on centos7 JIRA: - Currently there is no variable definition file of tacker for centos in os_tacker repo. This will lead an error while including vars on centos deployment. So this patch will add a file named "redhat-7.yml" for centos. Change-Id: I965834adb0d2d25e5a68a9c7dbb397342108078f Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-06Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Revert the unix permission of yaml file" - Revert the unix permission of yaml file Change-Id: I99da14477ab785475e425475fedca90a69eed8eb Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-06Update git submodulesmei mei1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "fix the issue of docker command to collect logs" - fix the issue of docker command to collect logs Change-Id: If5569d01012b0f94976d26dfb4cd81692a40c83d Signed-off-by: wutianwei <wutianwei1@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Fix some hard coding for some ip assignments" - Fix some hard coding for some ip assignments JIRA: COMPASS-570 1. fix hard coding in ip assignments for install network. support full ip assignments from network.yml 2. remove some used config item in deploy/conf Change-Id: I566b74f4a55e6b96af3ee9f41d1e183a73424a91 Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "deploy: remove gic version in arm vm template" - deploy: remove gic version in arm vm template GIC version is set to v2 in current Arm VM template, but ThunderX only supports GICv3 which results in the failure to start VM. This patch removes GIC version definition and let libvirt to figure out the default value based on host system. Change-Id: I0e487e13ee4192a705f635781b1071521f610db5 Signed-off-by: Yibo Cai <yibo.cai@arm.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Ansible callback support both V2.3 and V2.4" - Ansible callback support both V2.3 and V2.4 JIRA: COMPASS-585 1. Add conditional branch to support both ansible versions 2. Keep callback in ansible_plugins directory which will contains all plugins upcoming in the future Change-Id: I11f3d9700e07ad5bd7f03ad56f4e0bc061df05ec Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-06Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Upgrade ODL version to Nitrogen SR1" - Upgrade ODL version to Nitrogen SR1 JIRA: - Currently compass uses ODL Nitrogen, however the latest ODL version is Nitrogen SR1. So we upgrade to use the latest version to avoid some bugs. Change-Id: I8cc04955b9fc828eb3bc6096df6ac5b97438a259 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2018-02-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Stop printing data sent to DB https://build.opnfv.org/ci/view/functest/job/functest-daisy-baremetal-daily-master/lastFailedBuild/console Change-Id: I0f794159d05fe21f659ecf3b5a9fa407620b723d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Fix docstrings Else sphinx can't parse snaps_suite_builder.py and IxRestUtils.py. Change-Id: Iab231a043120154bce708263474b9f9926c1f715 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Switch to the readthedocs theme for api docs It also adds a requirement file for external doc tools wich couldn't handle upper constraints. Change-Id: Idf8f43e5e1a845055ce248f1dc8b8d676a3ac37b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Remove yamllint from upper-constraints.txt OpenStack doesn't list test requirements in upper constraints [1]. [́1] https://github.com/openstack/requirements/blob/stable/pike/upper-constraints.txt Change-Id: I7472158d385beb311c159563bc3bb973c4a2d4c7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-06Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Add build_sphinx section in setup.cfg Change-Id: Ieac48a1a213bc5cd62a42dab1c74c80761e82fd1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-05Update git submodulesagardner1-0/+0
* Update docs/submodules/releng from branch 'master' - Ansible Playbook to install build server deps This playbook has been tested in centos and ubuntu on Arm and x86_64 first: install ansible then: ansible-playbook -i inventory.ini main.yml What it does: installs on centos or ubuntu arm or x86_64 installs system deps with the package manager. and python libs with pip. installs docker https://download.docker.com installs docker-compose from distribution repo Change-Id: I3853cd04d0e6c7270ea068b9e1fba1a240a0652e Signed-off-by: agardner <agardner@linuxfoundation.org>
2018-02-05Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Fixed OSCreds retrieval." - Fixed OSCreds retrieval. The optional parameter 'project_name' was never getting a default value when not used causing an OSCredsError to be raised. Change-Id: I2a0986c62c5d9520f60ebd06db1f3a749e62361c Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-02-05Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Added 3 new subnet values for ansible substitutions Change-Id: Idd39e4f6e3f22fcbafe3aae2512ac36cf9e2a417 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2018-02-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/pharos from branch 'master' - [IDF] Schema: Add OSA installer stubs While at it, order installers by name in IDF schema. Change-Id: I4bf1dd047a3f7a64b8bc928951fc18c4728a9b68 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-05Update git submodulesmbeierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Updates for JOID Integration Changes daily to use the script from JOID to fetch OS information. Adds more environment variables to the OSCreds. Change-Id: I8cc07f82d6cc1bb70987a29947cc4093e8a2ff56 JIRA: STORPERF-238 Signed-off-by: mbeierl <mark.beierl@dell.com>
2018-02-05Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Blacklist Quotas.nova_update_and_delete test Excluded since the test occasionally fails due to race condition issue on quota manipulation in nova [1]. [1] https://bugs.launchpad.net/nova/+bug/1552622 Change-Id: Ib979c1e371727aa3adea9dc0b5955e7ed24881cf Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
2018-02-05Update git submodulesxudan1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Add all tempest smoke test cases into debug test suite Add all tempest smoke test cases into debug test suite. Then these test cases can be run by Dovetail on CI. The results of CI will help to choose sub test cases from tempest smoke. Here use tempest_custom to run all tempest smoke test cases because it can support to run a custom defined sub test cases list. for Functest tempest_smoke_serial, it always runs whole tempest smoke test cases and can't be a subset. JIRA: DOVETAIL-595 Change-Id: Id6358691d2bdef149f16775ce84dcfbf12f5e568 Signed-off-by: xudan <xudan16@huawei.com>
2018-02-05Update git submodulesxudan1-0/+0
* Update docs/submodules/dovetail from branch 'master' - Adapt Functest E release Framework Use opnfv/functest-restapi:euphrates. Adapt Functest E framework for all Functest test cases. 1. All path of functest and sdnvpn has been changed. 2. Sdnvpn can clean resources by itself with E release, no need to clean again. 3. Add a file testcases.yaml to overwrite the file in functest container, then it can support to run tempest_custom i.e. ipv6 and tempest in OVP. JIRA: DOVETAIL-584 Change-Id: I3ba9aa8e80becaa99cc89c8db4b39acbb89dfda4 Signed-off-by: xudan <xudan16@huawei.com>
2018-02-05Update git submodulesJuha Kosonen1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Add modules docstrings in snaps" - Add modules docstrings in snaps JIRA: FUNCTEST-922 Change-Id: I058486427fe55e1d1ce939fce20d75ff7afde85c Signed-off-by: Linda Wang <wangwulin@huawei.com>
2018-02-05Update git submodulesCédric Ollivier1-0/+0
* Update docs/submodules/functest from branch 'master' - Increase Rally full criteria Even if several tests are currently under investigation, it seems relevant to expect a full success here. Change-Id: I6a8c5fb5a7dd4bfb5c3a2e7a93de1c0bec77c878 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2018-02-05Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - [baremetal] Rename all to drop baremetal prefix A few things differ between baremetal and virtual nodes: - provisioning method; - network setup; Since now we support completely dynamic network config based on PDF + IDF, as well as dynamic provisioning of VMs on jumpserver (as virtual cluster nodes), respectively MaaS-driven baremetal provisioning, let's drop the 'baremetal-' prefix from cluster model names and prepare for unified scenarios. Note that some limitations still apply, e.g. virtual nodes are spawned only on jumpserver (localhost) for now. JIRA: FUEL-310 Change-Id: If20077ac37c6f15961468abc58db7e16f2c29260 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [virtual] PDF-based network defs for cluster nodes Decouple virtual cluster nodes (ctl, gtw etc.) from opnfv_fn_* vars in favor of parsing PDF/IDF. This is the first step towards unifying baremetal and virtual network definition templates, as well as allowing virtual nodes to run on a remote hypervisor (and eventually with a different arch). opnfv_fn_* vars will still be used for infra VMs spawned on FN (cfg01 and optionally mas01). Adopt new 'net_map.j2' from Pharos submodule for new templates (virt), as well as old ones (baremetal). JIRA: FUEL-322 Change-Id: I150c2416566bbe42ea11cd00f12a8a7bf96776c2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [virtual] Parameterize cluster model based on PDF - 10.1.0.0/24 (internal): * 10.1.0.101 -> opnfv_openstack_compute_node01_tenant_address * 10.1.0.124 -> opnfv_openstack_gateway_node01_tenant_address - 172.16.10.0/24 (mgmt): * 172.16.10.11 -> opnfv_openstack_control_node01_address * 172.16.10.100 -> opnfv_infra_config_address * 172.16.10.101 -> opnfv_openstack_compute_node01_control_address * 172.16.10.111 -> opnfv_opendaylight_server_node01_single_address * 172.16.10.124 -> opnfv_openstack_gateway_node01_address - 10.16.0.0/24 (public): * 10.16.0.11 -> opnfv_openstack_control_node01_external_address * 10.16.0.101 -> opnfv_openstack_compute_node01_external_address * 10.16.0.124 -> opnfv_openstack_gateway_node01_external_address To re-use DPDK config baremetal template, move: - cluster.baremetal-mcp-pike-ovs-dpdk-ha.infra.config_pdf + cluster.all-mcp-arch-common.infra.config_dpdk_pdf Drop unused 'ceilometer_graphite_publisher_host' (172.16.10.107). JIRA: FUEL-322 Change-Id: I3aef3415bd696a7ae5b566af12af4733a50c2135 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [virtual] Change IP addrs to align with baremetal To be able to re-use pod_config.yaml parameters generated based on PDF for both baremetal and virtual scenarios without forking it, we first need to align the IP addresses used in virtual deployments. Currently hard set values will be parameterized in an ulterior change. - 10.1.0.0/24 (internal): * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); - 172.16.10.0/24 (mgmt): * 101 -> 11 (ctl01); * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); - 10.16.0.0/24 (public): * 101 -> 11 (ctl01); * 105 -> 101 (cmp01); 106 -> 102 (cmp02); * 110 -> 124 (gtw01); JIRA: FUEL-322 Change-Id: I5d5def4e92c3462f1a34f73dde65ef7a262a5d62 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [virtual] Split 'pxebr' from 'mcpcontrol' net - add new virsh managed network 'pxebr' (to mimic baremetal behavior on virtual PODs, this will be the equivalent of PXE/admin network); - connect 'pxebr' to 3rd interface for cfg01, mas01 for all deploys (used to be baremetal-specific), replacing 'internal'; - keep 'mcpcontrol' connected only to 'cfg01' (+ 'mas01' if present) for initial infrastructure bring-up (1st interface); - switch all virtual cluster nodes to 'pxebr' (1st interface); - use 'pxebr' for all Salt cluster nodes traffic, 'mcpcontrol' only for mas01<=>cfg01 Salt traffic; - convert <user-data.template> to jinja2 and expand it based on PDF instead of using `envsubst`; - split <user-data.sh.j2> into two versions, one for each network used for Salt traffic; - ci/deploy.sh: Read scenario data before template parsing for cluster domain variable, needed in virsh network def; - leave docs diagram refresh to later after all possible deploy types have settled; - limit keyserver proxy usage to nodes where the configured http proxy matches the first nameserver (true for all MaaS-provisioned nodes), so we can re-use the same pillar for FN VMs and baremetal nodes; - add PXE/admin IP on cfg01's 3rd interface and switch other vnodes `salt_master_host` to point to it; JIRA: FUEL-322 Change-Id: Ie4f7aedddf2ef81046f1127b377d88dce79f0fda Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [FN VM] Reboot VMs on jump, wait for all online - apply `linux` state on cfg01 first, so PXE/admin IP is added and FN VM minions are available; - add barrier and wait for all FN VMs to register with cfg01; - use batch-mode execution while applying `linux.network` on FN VMs; - retry all states executed via <salt.sh> on FN VMs; JIRA: FUEL-310 Change-Id: I72e1c565370072500df1d486fe76e6315f583c75 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] Switch to generate_config, unify templates - move bash template handling (previously expanded via `envsubst`) to lib.sh; - move j2 template handling to lib.sh; - move virsh network templates to 'mcp/scripts/virsh_net' subdir; - switch virsh network templates from `envsubst` expansion to j2 and leverage generate_config.py, similar to PDF Fuel installer adapter; - add relevant runtime env vars (e.g. SALT_MASTER, MAAS_IP) on the fly to PDF, to consume them in templates like params coming from PDF; - parameterize virsh network definitions based on PDF (mgmt, public); JIRA: FUEL-322 Change-Id: Ib94e78fc4f25797b9354a0552e884104da5d0003 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - deploy.sh: Move notify() to globals.sh Extend `notify` to 4 variants: - notify_i = inline (no newline) colored output; - notify = `notify_i` + trailing '\n'; - notify_n = `notify` + extra '\n' before and after; - notify_e = `notify` + stderr output + exit; This allows us to remove '\n' and cleanup the code a bit. While at it, fix some 'NOTE' messages going to stderr instead of stdout. Change-Id: I682e3344ae9e307c4a68ab31c7766bc91b12ee58 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - deploy.sh: Make PDF, IDF mandatory for all deploys - hard requiremenet of PDF/IDF configuration for all deployments; - expand j2 templates for virtual deploys too; Since until now we used the same model for *all* virtual PODs, one of the PDF/IDF sets for existing vPODs (e.g. ericsson-virtual3) can be re-used practically on any host, without defining new vPODs. JIRA: FUEL-322 Change-Id: Iac6aab91b6958d0e5e175ed142da6aafadc6fac6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [vPDF] Use local-virtual1, unify pkg requirements Until PDF/IDF land in Pharos for all our virtual PODs, use a common vPDF we already provide as an example to mimic the old hardcoded behavior while leveraging PDF/IDF parameterization. As a consequence, python requirements previously only needed for baremetal should now also be installed for virtual deploys too. JIRA: FUEL-322 Change-Id: Ied1c907275285a9086450a15491ae516a0db1be2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [vPDF] Add experimental vPOD lab config JIRA: FUEL-322 Change-Id: I1482badbbbf66b4855faf6daf486520fc71e09b0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [baremetal] Retire example pod_config.yaml It is easier to just generate the `pod_config.yaml` file than to maintain it, so let's remove it. While at it, link sample PDF/IDF inside pharos git submodule, so we don't have to pass a different lab-config URI to use the sample. To generate pod_config.yml for the sample PDF/IDF: $ ./ci/deploy.sh -l local -p pod1 -s os-odl-nofeature-ha -d $ cat mcp/deploy/images/pod_config.yml JIRA: FUEL-322 Change-Id: If5898f92ef54bebc31d57f9632959e9093a89250 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> - [PDF] pod1: Refresh PDF, IDF examples Sync latest changes from pharos git repo for our sample PDF/IDF: - move net_config from PDF to IDF; - minor cleanup; JIRA: FUEL-322 Change-Id: If6865ac61a4942a1dd5daf7081fd8faa67e0e7bf Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-02-05Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'master' - Merge "Seperate compass-tasks" - Seperate compass-tasks JIRA: - 1. Keep openstack-ansible in compass-tasks-osa. Keep kubespray in compass-tasks-k8s. Build different compass-tasks in one tar ball. Identify which one to use during docker-compose. 2. Temporarily using private docker repo. 3. COMPOSE_IMAGES is used to controll which components to form compass-core regardless of specific repo. Set default value for openstack and kubernetes when perform single cluster deploy. Change-Id: Ief52580e954c602575c9bf8abe5733c100876c7f Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
2018-02-05Update git submodulesFatih Degirmenci1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Set TEST_DB_URL in env" - Set TEST_DB_URL in env It follows the change "Move push_results_to_db to TestCase" [1] which stopped duplicating TEST_DB_URL in config and in env. [1] https://gerrit.opnfv.org/gerrit/#/c/49757/ Change-Id: If860492c40b1d0ed4082a4dbe385686020697f37 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>