summaryrefslogtreecommitdiffstats
path: root/config
AgeCommit message (Collapse)AuthorFilesLines
2018-08-15Modify common patches schema to per branchTim Rozet9-34/+28
The common patch design doesn't really work across branches very well. This patch makes it so the common patches are specified in the same file, but on a per branch basis. Making it easier to manage common patches per branch. Also, includes a fix and adds test coverage to the prep_image method where we were referencing 'undercloud_admin_ip' before assignment in a case where we were not using ODL and had patches to overcloud. Change-Id: I7672947afd826fdc0042361a0139e22d6d5dd864 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-14Allow common patches fileTim Rozet5-14/+8
This patch adds allowing for common patches that should be applied to every scenario to be included. It by default pulls in a file in the deploy directory 'common-patches.yaml', but can optionally be overridden. This patch also includes a patch upstream to fix OSCLI not working anymore due to breakage with the Cinder version in the overcloudrc. Change-Id: I97b9efb937deff07e085b9ef75b9799fb65bfc57 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-08Bump deploy timeoutTim Rozet6-10/+16
We are seeing queens baremetal deployments are all failing in step 5 due to timeout. Not sure why the sudden increase in deployment time, but we can try increasing the deploy timeout to see if it fixes it. Also includes a revert for a commit that broke OOO master: https://bugs.launchpad.net/tripleo/+bug/1785872 Change-Id: I0bcfd5b3ca49b176f901c13b8b432fa29c899188 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-08-06Revert "Fix BGPVPN Queens scenario files to be consistent"Ricardo Noriega2-0/+0
This reverts commit b88eb3c7a1578cb251282c358fad6d87e7439868. Change-Id: If5a2548e647de099229824761c6c575ca4f2e815 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-03Fix BGPVPN Queens scenario files to be consistentRicardo Noriega2-0/+0
Change-Id: Id5b932246020676e1e53438db689e32bc124939e Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-08-02Enable BGPVPN for master deploymentsRicardo Noriega4-4/+34
- Injection of Quagga tarball via overcloud builder. - Extraction and installation of all related packages. - It uses SDNVPN artifact repository to download Quagga tarball, so there is only one source to test. - Modifies bgpvpn scenario files to use OS master branch, ODL master branch and containers. JIRA: APEX-627 Change-Id: Icdbc2853d9531048e23fd6d5e444bd68208d18fc Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-07-18Add tenant vlan supportFeng Pan4-0/+351
Introduces tenant vlan support through configuration of network settings file. JIRA: APEX-272 Change-Id: Ie8e20a92ca4ebb9e0de4c53b5e03856d19ff660c Signed-off-by: Feng Pan <fpan@redhat.com>
2018-07-17Update queens ODL to include OF table fixTim Rozet2-3/+9
Also includes minor fix to patching where stable was not being removed from the short hand branch name correctly. Includes fix where path was changed in queens for env files: https://review.openstack.org/#/c/567810/ Change-Id: Ia3a6769be70ea97c9bec9d5539c9ab0373fed30a Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-16Merge "Add support for kubernetes deployment"Tim Rozet2-0/+21
2018-07-13Fix OpenDaylight Oxygen deployment failures (master)Tim Rozet2-1/+8
ODL scenarios are failing deployment with oxygen because table 17 from the OpenFlow pipeline is missing. This pulls in an upstream patch to no longer check for table 17. The default table 17 flow has been removed upstream which is why it no longer appears during deployment. This patch fixes master OS branch scenarios only. Once the patch is cherry-picked to queens we can submit a new patch updating the DS settings. Change-Id: If60cf25c75440e3a1998b412ac8b903849507dab Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-07-06Add support for kubernetes deploymentZenghui Shi2-0/+21
This patch adds capability to deploy kubernetes cluster instead of openstack. Kubernetes will be deployed using kubespray and is run after TripleO bookstraps overcloud nodes. JIRA: APEX-574 Change-Id: If9c171620c933a052b719e7112a50e22bbab667f Signed-off-by: Feng Pan <fpan@redhat.com> Signed-off-by: Zenghui Shi <zshi@redhat.com>
2018-07-06Physical interface type noteTomi Juvonen1-1/+1
add ovs_bridge as needed compared to earlier version Change-Id: I1d0c6df9d1f47b0c98a3c1a8bf3a04eb5f53aff2 Signed-off-by: Tomi Juvonen <tomi.juvonen@nokia.com>
2018-06-15Adds missing queens deploy settings filesTim Rozet2-0/+23
Change-Id: I87508e6d486ade6e4acd8dec69a4c867b0d81252 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-06-14Fixes deployment failure with allNodesConfigTim Rozet4-4/+12
This pulls in upstream patch to revert a bad commit that causes the "Unknown Property controller_ips". Also includes a fix for being able to detect if patches that are merged upstream are also promoted into TripleO images or container images. This happens by comparing the time the patch was submitted to the time when the TripleO Image or Docker Image was last updated. JIRA: APEX-610 JIRA: APEX-612 Change-Id: I1c2ab7fb4425b407acd7b6d9ebab914ed3a24478 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-05-30Updates configs for ODL CSIT deploymentsTim Rozet2-12/+321
For ODL CSIT we want to deploy with: - Minimum services per role - 2 Compute nodes, 1 controller - Single network enabled Change-Id: If611c4c1ff68629670ef15904930124b5786a569 Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-05-21Migrates master to use direct upstreamTim Rozet10-66/+26
We now move master to deploy from upstream. That means we do not need to build undercloud/overcloud images anymore. Changes-Include: - Remove bash build scripts as we do not need to build anything other than the python package anymore - Remove building images or iso from build.py - Remove building of images and iso from Makefile - Rename/refactor deploy settings files for nosdn and odl. The new convention is that the typical scenario names we use will deploy master. We also support n-1 OS, so in that case we use the branch name for the "feature" in the scenario name: os-odl-queens-noha. - Tacker/Congress are disabled in settings files until we fix that with upstream. Containers are now enabled by default. - Disable TLS for undercloud (was changed upstream to default enabled) - Fix environments docker directory for master THT (was changed upstream) - Includes fix for LP#1768901 - Includes workaround for LP#1770692 - Moves to docker.io for container images as it is more stable and should contain the same images - Removes the term 'common' from apex packaging for referencing the Python Apex package Change-Id: If6b433860b3ff882686c78d0f24a2f0c52b9b57a Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-04-17Fix nosdn fdio scenarioFeng Pan2-318/+6
- Update networking-vpp to use master branch - Update THT vpp ml2 environment file with correct parameters - Update external network creation command to use 'externa' as provider network name. - Remove vpp network settings file as it's not used apex-tripleo-heat-templates: Ia25db8456f1ad6beb96c7b9b5f318b166ef4576a apex-puppet-tripleo: I231054a433eb7e598a6e24f6eaea02d476e776de Change-Id: I4a1f68c75ae3b7d2a5b347d05abf0d025e8b116b Signed-off-by: Feng Pan <fpan@redhat.com>
2018-04-09Enable nosdn-fdio scenarios for Fraser releaseFeng Pan1-2/+2
- Update neutron NSDriver patch - Update os-net-config to fix config errors for vpp uio-driver - Update puppet-tripleo to add configuration of physnets and type_driver in vpp agent - Update THT to change VPP environment file for vpp-agent, and add common.yaml for vpp interface mapping - Update VPP and networking-vpp version to 18.01 - Fix networking-vpp rpm build to enable proper uninstall. - Update networking settings file to use ovs_bridge as default external interface type JIRA: APEX-578 JIRA: APEX-568 JIRA: APEX-576 JIRA: APEX-577 apex-os-net-config: I915d5455acb8d496438b9c9e851639d3a43e6fa9 apex-puppet-tripleo: I472879b8f67e64b571638a0385943597a9120e6c apex-tripleo-heat-templates: I5dfaf85d67fb038109edaf5c5d8a3e901b9148f4 Change-Id: I369bee232bfafef260d2ef19ac32614fdc487271 Signed-off-by: Feng Pan <fpan@redhat.com>
2018-03-16Enables containerized overcloud deploymentsTim Rozet7-3/+57
Changes Include: - For upstream deployments, Docker local registry will be updated with latest current RDO containers, regular deployments will use latest stable - Upstream container images will then be patched/modified and then re-uploaded into local docker registry with 'apex' tag - Deployment command modified to deploy with containers - Adds a --no-fetch deployment argument to disable pulling latest from upstream, and instead using what already exists in cache - Moves Undercloud NAT setup to just after undercloud is installed. This provides internet during overcloud install which is now required for upstream container deployments. - Creates loop device for Ceph deployment when no device is provided in deploy settings (for container deployment only) - Updates NIC J2 template to use the new format in OOO since the os-apply-config method is now deprecated in > Queens JIRA: APEX-566 JIRA: APEX-549 Change-Id: I0652c194c059b915a942ac7401936e8f5c69d1fa Signed-off-by: Tim Rozet <trozet@redhat.com>
2018-03-15Adding SRIOV scenarioRicardo Noriega3-0/+47
This scenario should enable SRIOV interfaces to be used by Neutron. Only will be supported in baremetal deployments with SRIOV capable NICs. The name of the interface must be known in advance and the physnet of the SRIOV network is set as nfv_sriov. Change-Id: Ie4295413e0be2197bd9ada4f887f6b47cd486765 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2018-02-16Add http(s)_proxy handling to apexDan Radez4-0/+16
JIRA: APEX-512 Change-Id: I875bd99203b425e448e7a3f64eb9a8f99d03ddaf Signed-off-by: Dan Radez <dradez@redhat.com>
2018-02-09Merge "Adding L2GW Scenario"Tim Rozet2-0/+24
2018-02-07Allow disabling ipxe for provisioningDan Radez1-2/+5
JIRA: APEX-535 Change-Id: I52d17e962fc4a504db1ddbc20df0ac56a208f34b Signed-off-by: Dan Radez <dradez@redhat.com>
2018-02-07Adding L2GW ScenarioRicardo Noriega2-0/+24
This scenario allows you to install L2GW Neutron driver and point to OpenDaylight as service provider. apex-tripleo-heat-templates: I37039207bc7cf9965d26e6dfa034e84bf9b7224d Change-Id: I0dfd37bcc5060f0ad8caa95e1f87a7411bd6e723 Signed-off-by: Ricardo Noriega <rnoriega@redhat.com>
2017-12-05Make introspection optionalDan Radez1-0/+3
- exposes new option to end users to skip introspection - moves the logic to decide to introspect or not into python JIRA: APEX-536 Change-Id: Ieaff11362ff8f906daa98d301d3d473ad549d08f Signed-off-by: Dan Radez <dradez@redhat.com>
2017-11-27Migrate default ODL from Carbon -> NitrogenTim Rozet10-12/+12
Change-Id: If64212b33bf9ad3b9900ca18b39c90839f745843 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-11-06Adds ability to deploy from upstream openstackTim Rozet2-0/+29
To deploy with upstream openstack branch, use new deploy setting 'os_version'. A default scenario file for nosdn with pike has been included in this patch. If 'os_version' is a version other than the default version for this OPNFV release, then upstream is used. In order to use upstream with the current OS version use '--upstream' argument to the deploy command, to force an upstream deployment. Also include '-e upstream-environment.yaml' to use default upstream deployment settings. Supports nosdn and odl-nofeature deployments. Change-Id: Ic07e308827b449637b4e86cdd086434e4de2fb69 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-09-29Adds Calipso scenarioTim Rozet1-0/+9
Change-Id: Icc8a23e49c9ccc011481f6b97599d4f75873ebb1 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-09-28re-enable support for fdio dvr scenarioFeng Pan4-6/+6
- Update FDIO scenarios to use master branch images - Update VPP/HC version to master for all fdio scenarios apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33 apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607 apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c Signed-off-by: Feng Pan <fpan@redhat.com>
2017-09-21Revert "Adds Calipso scenario"Tim Rozet1-9/+0
This reverts commit 433961f8c0b816f19aa858654261fa87d2f02a19. Change-Id: Ic8a14d2e0ad8d1006625af401fde2f365890650b Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-09-20Adds Calipso scenarioTim Rozet1-0/+9
Calipso uses docker containers and is post deployment feature that can be used to monitor pieces of the stack. This patch installs it to the undercloud rather than the jumphost as it is easier to manage for cleanup and dependencies. Change-Id: Ie2dacc4f14b391a864fafb2e75ebcd15facb19f1 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-09-14Cleaning up yamllint warningsDan Radez3-1/+3
yamllint output: build/baremetal-environment.yaml 1:1 warning missing document start "---" (document-start) build/opnfv-environment.yaml 6:3 warning comment not indented like content (comments-indentation) 14:4 warning missing starting space in comment (comments) 123:1 warning comment not indented like content (comments-indentation) 128:1 warning comment not indented like content (comments-indentation) 156:1 warning comment not indented like content (comments-indentation) config/deploy/os-odl-fdio-dvr-ha.yaml 1:1 warning missing document start "---" (document-start) config/deploy/os-odl-fdio-dvr-noha.yaml 1:1 warning missing document start "---" (document-start) config/network/network_settings_v6.yaml 225:6 warning missing starting space in comment (comments) Change-Id: I3985ce0b6740ce4694b5d75b477cb03c3dc49c28 Signed-off-by: Dan Radez <dradez@redhat.com>
2017-09-11Updates SFC to use nitrogenTim Rozet2-2/+2
Also fixes issue where openvswitch NSH rpm was not getting installed because we needed to downgrade now that default OVS is 2.7 and NSH OVS is 2.6.1 Change-Id: I1b639ca80214032e93aacb3332e9588d49e74127 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-08-11Add os-odl-fdio-dvr supportFeng Pan6-8/+80
apex-tripleo-heat-templates: I6a83c9e2deeb0df9a3ab09a707c9c64aa84da55e apex-puppet-tripleo: I2025e3157b97b376b63002003ca17c7206aba546 JIRA: APEX-466 Change-Id: Iedb75994d35b5dc1dd5d5ce1a57277c8f3729dfd Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-09Enables SFC scenariosTim Rozet2-0/+22
apex-tripleo-heat-templates: I230b31dc9ed0ecc5046064628ba2f2505e589522 apex-puppet-tripleo: Icd433ddc6ae7de19a09f9e33b410a362c317138a Change-Id: I0b17b4e86eb90b949bd62f7e73944adad77ef1a3 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-08-08[KVMFORNFV]kvm+ovs+dpdk scenario for E-releaseNavya2-0/+56
This patch consists of implementation of the KVMFORNFV os-nosdn-kvm_ovs_dpdk-ha and os-nosdn-kvm_ovs_dpdk-ha scenarios. Format of comment to trigger gate should be as follows: start-gate-scenario: os-nosdn-kvm_ovs_dpdk-noha Change-Id: Ia320ed8ac44f6b62c3875efe5e44a1df7a0fc777 Signed-off-by: Navya Bathula <navyax.bathula@intel.com>
2017-08-04Add support for nosdn-ovs-dpdk scenarioFeng Pan2-0/+2
Change-Id: I31fca214b7d16cecc261137567fa7ecf63abfe04 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-08-02Merge "Add overlay_ip_version config for IPv6 tenant networks"Tim Rozet1-2/+2
2017-08-01Add overlay_ip_version config for IPv6 tenant networksFeng Pan1-2/+2
Change-Id: I03b28bdcc6d0649920fd58fb3400b2a4e5891e68 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-07-31Adds Barometer servicejhinman12-0/+18
Adds Barometer service as a deploy option to Compute nodes by specifying barometer as true in deploy settings. Barometer packages are installed only for x86_64. Adds scenarios os-nosdn-bar-ha and os-nosdn-bar-noha. Add scenarios to opnfv-apex-common.spec. Temporarily remove references to snmp packages. apex-tripleo-heat-templates: I397d2557639c87ab8afacd076a5b9fd7c056dce7 apex-puppet-tripleo: I878ff8d1e0a8b96f3380bb77f168cd5a4c3f6543 Puppet module is at: https://github.com/johnhinman/puppet-barometer. Change-Id: Ic087c2052f7849ee2cf6c63224558c2b36a8ca1f Signed-off-by: jhinman1 <john.hinman@intel.com>
2017-05-17Merge "Refactors build script for Apex"Tim Rozet1-29/+0
2017-05-17Refactors build script for ApexTim Rozet1-29/+0
Changes Include: - Build has been refactored into python - Caching now packs into multiple unique tar files which are logged into a journal file - Multiple files and journal allow for multiple apex builds to run simultaenously while minimizing risk of collision between cache reading and writing - Build dependency packages updated and will install when missing via ansible - If more than 2 caches exist then prune the oldest cache Change-Id: Iae703253eb6034aee42bf33153bb6e434d3cec48 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-05-15Removing sdn_l3 and _l2 scenario featuresDan Radez27-113/+0
JIRA: APEX-429 Change-Id: Ifb28bb27f8e58ac5b180454719dfb329c3edf000 Signed-off-by: Dan Radez <dradez@redhat.com>
2017-05-10Adding yamllint to build checksDan Radez36-447/+795
- making formatting changes to yaml files to meet yamllint checks Change-Id: Id48a8446512943e908e61dc00bbe6c033af27775 Signed-off-by: Dan Radez <dradez@redhat.com>
2017-05-09Updating Apex to OpenStack OcataDan Radez11-14/+14
- power management updated to virtualbmc, pxe_ssh is deprecated - removing custom tacker build - removing custom congress build - disabling yum update in undercloud on the cli instead of in a patch - Undercloud is direct kernel booted now, there are no kernel and initrd in the disk image from upstream - remove OpenDaylight previous to Carbon JIRA: APEX-433 JIRA: APEX-432 JIRA: APEX-431 Change-Id: I6963f16e65eacade5607a3082b58b6150331406c Signed-off-by: Dan Radez <dradez@redhat.com>
2017-04-18Add ODL netvirt VPP supportFeng Pan1-0/+38
opnfv-tht-pr: 131 Change-Id: I112d454078bd29a386b8557bf1d015d81f328d61 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-04-10Add VPP interface options supportFeng Pan2-0/+4
Interface options is needed for nosdn-fdio scenario to disable vlan strip offloading for enic. Change-Id: I7d7e3d7e6e0c822a13113911a41a3d076ecbd509 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-04-04RPM version update / ovs_dpdk renameDan Radez4-0/+0
- updating RPM version numbers for Euphrates - renaming ovs scenario to ovs_dpdk JIRA: APEX-434 Change-Id: I75e1d96bd613ea04e2ffd12bd41b3a536ff75d7f Signed-off-by: Dan Radez <dradez@redhat.com>
2017-04-03Removing symlinks to odl_l3 scenario filesDan Radez7-7/+0
Change-Id: I43f1edcb8552876f2edcd1395cdd7b510bef646b Signed-off-by: Dan Radez <dradez@redhat.com>
2017-03-30Euphrates Docs update w odl scenario name cleanupsDan Radez16-164/+170
- updating docs to reference Euphrates - removing the odl_l2-nofeature scenario, it's obsolete - renameing odl_l3 to odl, it's default for odl now - adding symlinks to files to _l3 files so CI doesn't break will remote those once CI is updated to use new names Change-Id: I9f2646fc5dac443042c5f4be8cca7d2df5dca663 Signed-off-by: Dan Radez <dradez@redhat.com>