aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
AgeCommit message (Collapse)AuthorFilesLines
2017-08-22Return back infra interfaces configMichael Polenchuk2-2/+2
Change-Id: I4baa9940ae14ef6e084fda7169ec43be7cf3f449 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-22Shift vcp nodes interfacesMichael Polenchuk7-19/+19
* shift vcp nodes interfaces since names started from ens2 * add extra salt sync before vcp start up * run rabbitmq state on 1st node beforehand then the rest Change-Id: Ic2c174c288a5e89f2f28c0d9aa573340190a61d3 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-21reclass: baremetal: openstack: Fix eth assignmentAlexandru Avadanii6-11/+17
Baremetal support introduced a couple of VCP VMs, which have 2 network interfaces: - primary (ens3 inside x86 VM) - connected to "br-mgmt" bridge on each kvm node, serves for MaaS DHCP / connection to salt master; - secondary (ens4 inside x86 VM) - connected to "br-ctl" bridge on each kvm node, serves for Openstack Management network; However, the reclass model was configured to use a single IP address on the primary interface, breaking the connnection to salt master, while also not connecting the Openstack Management network properly. Fix this by configuring the primary interface for DHCP, while the secondary gets a static IP in Openstack Management network. Change-Id: I9f1d6f080e882bfaae7b5f209bc3c5536826ba06 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-21Swap vcp nodes interfacesMichael Polenchuk1-2/+2
In order to connect to right underlay bridge, swap interfaces. Change-Id: I0ae1f50e8d1f3485404bd7e6eea772cab555b313 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-21Merge "virtual: odl-router: Stop overriding Ubuntu repos"Alexandru Avadanii1-1/+0
2017-08-19MaaS: Add support for dynamic fabric numberingAlexandru Avadanii1-3/+7
Previously, we hardcoded the fabric name for our 3rd interface (which serves PXE/DHCP for the target nodes) to "fabric-2", relying on predictable index numbers to be provided by MaaS based on the interfaces defined in /etc/network/interfaces. However, the fabric IDs/names generated by MaaS are not predictable, and therefore cannot be hardcoded in our reclass model / scripts. Work around this by: - adding support for fabric ID deduction based on CIDR matching during subnet create/update operation in MaaS py module; - adding support for VLAN DHCP enablement to MaaS py module, which was previously handled via shell MaaS API operations from maas/region.sls; While at it, revert previous commit that disabled network discovery ("MaaS: Disable network discovery"), since it turns out that network discovery was not the culprit for subnet creation failure, but wrong fabric numbering. This reverts commit 8cdf22d1a1bae4694a373873cab4feb6251069b7. Change-Id: I15fa059004356cb4aaabb38999ea378dd3c0e0bb Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-19MaaS: Disable network discoveryAlexandru Avadanii1-1/+1
In case nodes are already powered on and have an IP in the same range as the new MaaS DHCP one (e.g. from a previous deploy), MaaS API will reject the subnet creation due to overlapping addresses. Try to work around this by disabling network discovery. Change-Id: I70a33c552bf38a7ccbc1bb7e90c21f424f082bc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18MaaS: DHCP iprange fix: use dynamic, not reservedAlexandru Avadanii1-0/+1
Without the 'type' parameter set to 'dynamic', MaaS was configured to reserve the IP range instead of allocating it dynamically. This led to IP exhaustion warnings in MaaS dashboard, as well as wrongful IP allocation. Change-Id: I1f2b90bf4cd2393cfab6d4bc17771cef009701c0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18MaaS node: Fix dhcp_interface configAlexandru Avadanii1-1/+5
Explicitly configure dhcp_interface for mas01, in order to allow the interface name to be parametrized via "dhcp_interface" _param. Change-Id: I6a2750adc1941c0aa1f94ac9b39133b5bd2388c6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-18Apply network config on kvm nodesMichael Polenchuk2-1/+1
* re-assign ip from interface to bridge - install bridge utils - make a reboot straight away after network config * change image source for vcp Change-Id: I34506ee161337b5d3a4088cfdf3c082d99ccb695 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-17Bring in baremetal supportAlexandru Avadanii20-0/+1331
- ci/deploy.sh: fail if default scenario file is missing; - start by copying reclass/classes/cluster/virtual-mcp-ocata-ovs as classes/cluster/baremetal-mcp-ocata-ovs; - add new state (maas) that will handle MaaS configuration; - Split PXE network in two for baremetal: * rename old "pxe" virtual network to "mcpcontrol", make it non-configurable and identical for baremetal/virtual deploys; * new "pxebr" bridge is dedicated for MaaS fabric network, which comes with its own DHCP, TFTP etc.; - Drop hardcoded PXE gateway & static IP for MaaS node, since "mcpcontrol" remains a NAT-ed virtual network, with its own DHCP; - Keep internet access available on first interfaces for cfg01/mas01; - Align MaaS IP addrs (all x.y.z.3), add public IP for easy debug via MaaS dashboard; - Add static IP in new network segment (192.168.11.3/24) on MaaS node's PXE interface; - Set MaaS PXE interface MTU 1500 (weird network errors with jumbo); - MaaS node: Add NAT iptables traffic forward from "mcpcontrol" to "pxebr" interfaces; - MaaS: Add harcoded lf-pod2 machine info (fixed identation in v6); - Switch our targeted scenario to HA; * scenario: s/os-nosdn-nofeature-noha/os-nosdn-nofeature-ha/ - maas region: Use mcp.rsa.pub from ~ubuntu/.ssh/authorized_keys; - add route for 192.168.11.0/24 via mas01 on cfg01; - fix race condition on kvm nodes network setup: * add "noifupdown" support in salt formula for linux.network; * keep primary eth/br-mgmt unconfigured till reboot; TODO: - Read all this info from PDF (Pod Descriptor File) later; - investigate leftover references to eno2, eth3; - add public network interfaces config, IPs; - improve wait conditions for MaaS commision/deploy; - report upstream breakage in system.single; Change-Id: Ie8dd584b140991d2bd992acdfe47f5644bf51409 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-13virtual: odl-router: Stop overriding Ubuntu reposAlexandru Avadanii1-1/+0
Keep UCA default apt sources, instead of overriding them with arch specific values from: - system.linux.system.repo.ubuntu Change-Id: I1edc725a97ae6290d316a7916c27fd904f59db04 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-08-09Synchronize down all of the dynamic modulesMichael Polenchuk1-0/+0
Sync all of the salt dynamic modules to make sure custom modules, states, grains & etc. are on the target nodes. Change-Id: I04f2ac0465d5381c4c07623e9383619d9b9731de Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-08Switch distrib revision to testingMichael Polenchuk1-0/+0
In order to avoid bleeding edge issues with nightly version of salt formulas, switch to "safe" testing repo source. Change-Id: I9d12f337c3952711cb8843943c23315795064016 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-03Merge "Set ntp servers list"Michael Polenchuk5-56/+22
2017-08-02Merge "reclass: opendaylight: Use UCA default repos"Alexandru Avadanii1-1/+0
2017-08-02Set ntp servers listMichael Polenchuk5-56/+22
* set ntp sweden servers list for virtuals * wrap common cluster init options Change-Id: I044802998d5498fed969e62bf1ea8c814652f34f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-02[odl-router] Bring up public network on computesMichael Polenchuk1-0/+28
* apply provider mappings on compute nodes as well * set default route of computes to gateway node Change-Id: I5715e34fd8ecbed87bd7f1b1ed488766af711bae Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-08-01reclass: opendaylight: Use UCA default reposAlexandru Avadanii1-1/+0
Current opendaylight pillar enforces a full apt repository cleanup, removing Ubuntu Cloud Archive (UCA) repos in favor of adding pre-hardcoded Ubuntu archive repos. Unlike UCA, main Ubuntu archive is split based on target arch, the main archive.ubuntu.com holding only x86 packages, while the other archs are hosted on ports.ubuntu.com. This leads to adding (only) x86-specific repositories to our AArch64 UCA image. Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the opendaylight pillar, leaving the default UCA repos in place. Change-Id: Ia7033bcb544d8752d5557bbabc92c92c5008b00c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-31[odl-router] Add missing nodes configMichael Polenchuk1-0/+10
Change-Id: Id7603aa581e4ccdddad1cf93f9434fe95c047800 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-31Bring in opendaylight L3/router scenarioMichael Polenchuk10-1/+558
Change-Id: I8a3be1764de136e2ecf81f964233483be5d6655a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-13Tune network sysctl optionsMichael Polenchuk6-6/+26
* tune net/tcp opts * handle vcpus setting for vms * fix tempest issue with public subnets visible * set reclass data source to local to avoid git clone Change-Id: Ibac9eba8234ebb20854c03b399405968cb2069e8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-12Apply reclass patches before salt master initMichael Polenchuk2-0/+0
Change-Id: I7bb984880e98b7bdec9aa0b3895a3be9fd75cac0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-11Set public endpoints to external interfaceMichael Polenchuk11-28/+262
In order to pass functest/api_check, configure public endpoints of openstack core services with external ip address. Change-Id: I519865df5700acbcf542ea71efd87780e9f1d9d5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-10Align reclass cluster model of dpdk scenarioMichael Polenchuk6-72/+73
Change-Id: I4fc0c0e040c97e91c79aae2f0142fb6f025081f2 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-06Enable cinder volume serviceMichael Polenchuk7-12/+12
Change-Id: I29ad8fc0e504779184fdf3795dc82ce1b031dbf8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-05Turn on opendaylight scenarioMichael Polenchuk4-19/+15
* fix formula & reclass cluster model * bring in running states Change-Id: I8e66e69045f5c745f9aa6f59f7ce6d66b5bf1c95 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-07-03Rewrite infra deployment scriptsMichael Polenchuk10-302/+0
* bring in scenario files * shift infra code into functions Change-Id: I650a26d03d842c3afcc7fcb97b84ef4826827a38 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-29Bring in opendaylight supportMichael Polenchuk9-0/+529
Change-Id: I2eed0cf19907f257be1cb4aee96528cc41f4843a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-28Set salt bootstrap distrib revisionMichael Polenchuk2-6/+2
Change-Id: Id278afd05fd8793f573fce0d4ca1ff7420fc9127 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-28Get latest salt-formulas codeMichael Polenchuk2-1/+5
Change-Id: I6284589343bfcdc4f35734d5c291ad0a2bf02d74 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-23Remove redundant services from noha scenarioMichael Polenchuk8-67/+69
Change-Id: I445f6ac802fbf1b382b18bcb4306eb5538cb1867 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-21Make virtual cluster as noha w/ one controllerMichael Polenchuk4-15/+3
* remove glusterfs from cluster * increase amount of ram on controller * bring in one more compute node Change-Id: I04ccd4cdaf65bb860d6d3b9c012e035f598e44d5 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-20Correct ssh key copy optionsVladimir Blokhin1-1/+1
Change-Id: Iea7a28fcd2ae59bc3ba76bffb42675dfc4bc917d Signed-off-by: Volodymyr Blokhin <vladrulez@gmail.com>
2017-06-20[mcp] Mend networks configMichael Polenchuk3-4/+5
* create openstack/neutron external network * set default gateway for mgmt network Change-Id: I71c22ab6d1b8c589c1cf147aa37874600ab1cbd7 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-19[mcp] Set default address for salt masterMichael Polenchuk1-0/+0
Change-Id: Iaa9cd3d5734fbf81a224d00ee006b63a66a915f0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-09[mcp] Copy ssh key to tmp dirAndrii Ostapenko1-0/+1
Copy ssh key to tmp dir to be able to retrieve OS credentials by releng/utils/fetch_os_creds.sh Also adds 'set -x' to ci/deploy.sh Change-Id: I056c626288862f84f47c947461894730ce0483ac Signed-off-by: Andrii Ostapenko <aostapenko@mirantis.com>
2017-06-06[mcp] Mend dpdk scenarioMichael Polenchuk5-24/+48
Make a reboot of the compute nodes to activate hugepages support and re-apply required states then. Also align ovs lcore & pmd masks with two cpu nodes. Change-Id: I4a5defe6f08e912aba2d939ba5ba057af768a40c Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-05-31[mcp] Bring in dpdk scenario supportMichael Polenchuk12-8/+488
Change-Id: Ifd6d61026a0e98e8faf59c7d218333122d70ffe9 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-05-29[mcp] Mend installation scriptsMichael Polenchuk3-12/+7
* add/unify ssh options * get base image to temporary directory * specify os type for virt install * fix symbolic link to reclass * remove outdated fuel submodules Change-Id: I6833ce78c8fff97e1b89f4e92e6e6b470e9ce99f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-05-26[mcp] Replace reclass system models with submoduleMichael Polenchuk431-9483/+10
Change-Id: Id693f7b0f3542d605b0f71601f3bd21eb882c7ba Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-05-25[mcp] Bring in deployment scriptsMichael Polenchuk9-0/+284
Change-Id: I7d2af958e447a5892f7cd1f6c6fb8616951e2ff3 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-05-24[mcp] Bring in reclass system salt modelsMichael Polenchuk436-0/+9950
Change-Id: I1a865b7524f3a5242544e60e6b36b1092721c58b Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>