summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-08-07Merge changes from topics 'baremetal-noha', 'move-maas-classes'Alexandru Avadanii22-25/+31
* changes: [noha] cinder: Align VG name with HA scenarios [reclass] Move system.single class to common [maas] Add reclass storage definitions for all [reclass] Move MaaS classes to common dir for NOHA
2018-08-06[ha] Bind cinder volume I/O on mgmt networkAlexandru Avadanii1-0/+1
JIRA: FUEL-367 Change-Id: I9a4171d2616af5ae1bafbf1740fd7c7f97c1768e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06[noha] cinder: Align VG name with HA scenariosAlexandru Avadanii1-0/+9
Prepare for MaaS integration in NOHA scenarios by aligning cinder VG naming across all scenarios. JIRA: FUEL-382 Change-Id: I0cd7accf573ae0904efddd7aa67d880f2a6deb71 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06[reclass] Move system.single class to commonAlexandru Avadanii7-6/+1
Include system.linux.system.single class globally in the common section, preparing for MaaS NOHA node definition. JIRA: FUEL-382 Change-Id: Icdfb2a90f356cd537631abe653950c0c30020551 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06[maas] Add reclass storage definitions for allAlexandru Avadanii2-1/+3
Reclass storage definitions for mas01 node should be added to all ha/noha scenarios, only when/if baremetal cluster nodes are involved. JIRA: FUEL-382 Change-Id: I455b07894b68eb89903df94352159ea6519275b0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06[reclass] Move MaaS classes to common dir for NOHAAlexandru Avadanii14-18/+18
Prepare for reusing MaaS-related reclass classes for NOHA scenarios. JIRA: FUEL-338 Change-Id: Ic8ddd5915563f58643ef8c7ac4055a1000db7d45 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-06Merge "[lib.sh] Reset virtual nodes after MaaS install"Alexandru Avadanii3-1/+23
2018-08-06[patch] Rebase keyserver patch for disabled reposAlexandru Avadanii1-36/+15
Rebase patch on top of upstream commit [1]. [1] https://github.com/salt-formulas/salt-formula-linux/commit/45cf452d Change-Id: Id44eab58150ff69140f630352a299633cdb4f4ac Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03[lib.sh] Reset virtual nodes after MaaS installAlexandru Avadanii3-1/+23
For hybrid PODs (e.g. x86_64 jumpserver + control nodes, aarch64 baremetal compute nodes), the virtual nodes rely on MaaS DHCP to be up when the OS boots, so issue a `virsh reset` accordingly. Instead of checking for online nodes using `test.ping`, use `saltutil.sync_all` to also sync Salt state modules to the virtual nodes (usually handled by baremetal_init state in HA deploys). JIRA: FUEL-338 Change-Id: If689d057dc4438102c3a7428a97b9638e21bfdc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03[lib.sh] Support older jumpserver libvirtAlexandru Avadanii1-1/+2
`virsh undefine` argument `--nvram` is only supported by newer versions of libvirt. Although this is mandatory for AArch64, for x86_64 this is not a blocker (since we don't enable OVMF for the VMs on the jumpserver). Change-Id: I3a82bc54b36228980a41d77a463a7558a685c03d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03[states] openstack_ha: Retry rabbitmq stateAlexandru Avadanii1-1/+1
For hybrid deployments, the first run of rabbitmq:server sls might lead to 'no response' and a retry of the whole `openstack_ha` state. JIRA: FUEL-338 Change-Id: I7ec663f9babc8c55d2c8a2b31a6e674452f04166 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-03Merge "[ha] AArch64: Add missing GPG key for armband repo"Alexandru Avadanii1-0/+2
2018-08-03[patch] Rebase keyserver support for update logicAlexandru Avadanii1-18/+23
Change-Id: Iad2502e876600ba966a38f2df3e71bd579f80e8f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-02[ha] AArch64: Add missing GPG key for armband repoAlexandru Avadanii1-0/+2
In a regular baremetal HA scenario, all cluster nodes are provisioned via MaaS, which also adds the Enea GPG key to the APT keyring. However, for a hybrid deployment, virtual nodes are not provisioned by MaaS, so the GPG key should be added to reclass pillar data explicitly for Salt to be able to import it. JIRA: FUEL-338 Change-Id: I333b7c373bdbc631c0f54ac549f97ab889dec77c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-02Merge "[ha] Add OVN scenario"Alexandru Avadanii8-6/+37
2018-08-02[ha] Add OVN scenarioGuillermo Herrero8-6/+37
JIRA: FUEL-329 Change-Id: I46c7dbc791441c6b069a0d56373ff98a32a57e60 Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-08-01[maas] Allow more than two compute nodesAlexandru Avadanii1-4/+6
Change-Id: Ie023bfe7b322a49a8b525e7926518c94899c67ce Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-31[ovn/noha] Simplify net scheme on compute nodesMichael Polenchuk2-13/+17
Also install OVS 2.9 from UCA repository to get the latest code/fixes. Change-Id: I09d6da67d28033bc0e64eef27fffb368d262d7f4 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-30Merge "[odl/noha] Simplify net scheme on compute nodes"Michael Polenchuk1-13/+5
2018-07-30[patch] Rebase keyserver proxy supportMichael Polenchuk1-84/+76
https://github.com/salt-formulas/salt-formula-linux/commit/f27f436 Change-Id: I9662dcff23c363430b6a04808f4e03617a10c160 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-30[odl/noha] Simplify net scheme on compute nodesMichael Polenchuk1-13/+5
Align external network scheme of computes with gateway node to setup just ovs bridge with physical port plugged in. Change-Id: Ie7919abc8c1f0a0905764b6354f29ad68d3c6557 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-27[noha] Bind cinder volume I/O on mgmt networkMichael Polenchuk1-0/+1
iSCSI read/write ops are acting up on interface/network (pxe/admin is chosen by default) with jumbo frames enabled, so configure iSCSI daemon to listen on management network. Change-Id: I3b643b151ba0abffe5cfe2ba7417010020eb07ae Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-26Revert "[salt master] Disable broken _orchestration.conf"Michael Polenchuk1-1/+1
This reverts commit 8ac1c0fa491ab5de2eaf128374f9c73202df1751. Upstream commit has been reverted, Change-Id: I3b20edd450034dc79ef15b46c1ff845f81aaf981 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-26Merge "Bring in Barbican service onboard"Michael Polenchuk11-1/+99
2018-07-26[salt master] Disable broken _orchestration.confAlexandru Avadanii1-1/+1
The new orchestration configuration file includes multiple fragments from all installed formulas; breaking due to an unguarded dependency include in keystone formula meta/salt.yml. Temporarily disable the new config generation until fixed upstream. Change-Id: I8476e5b60b531f08f779df2826b23cd42a043d9b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-24Merge "[salt-formulas] opnfv: Drop obsolete route_wrapper"Alexandru Avadanii4-33/+1
2018-07-24Bring in Barbican service onboardMichael Polenchuk11-1/+99
Change-Id: I68759360c9dd8f8cf422161e21ed15df6c694e84 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-23[MaaS] Arch-qualify Saltstack repo for XenialAlexandru Avadanii1-1/+1
Previous changes altering Saltstack repo URL did not add an arch qulification, leading to APT trying to fetch the repo metadata for the current system architecture, failing on arm64 systems. Change-Id: Ibe32d90a8da2e04563ac9170939de92a4db233fd Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-23Rectify control address on compute nodesMichael Polenchuk4-23/+13
Change-Id: I5734431d54c0d0ad9fb337fc37ce3b31a3c58e0a Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-20Align SDN credentials variablesMichael Polenchuk2-4/+4
Change-Id: I731abc6871ddd845b551a837e942d2a2d77a67ee Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-19Merge "[maas] Change saltstack repo source format"Michael Polenchuk1-1/+1
2018-07-19Merge "Set OpenDaylight REST port in openrc"Michael Polenchuk7-6/+12
2018-07-19[maas] Change saltstack repo source formatMichael Polenchuk1-1/+1
Change-Id: I2a25734258f34ed02da584456a3a3dac70e24af3 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-18Set OpenDaylight REST port in openrcMichael Polenchuk7-6/+12
JIRA: FUEL-380 Change-Id: I16039f6a0397f761e4cfa58be4cd45fd0beab925 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-07-16[salt-formulas] opnfv: Drop obsolete route_wrapperAlexandru Avadanii4-33/+1
Change-Id: I84a4789ff2155d7c14f9ffd9bfe54c5bca7a0d4f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-12[salt.sh] Ignoring files using rsyncJunaid Ali1-1/+7
Currently rsync is not ignoring '.gitignore' file due to the specification of absolute path. This patch fixes the issue and also ignores the temporary directory if that is created inside the cloned fuel repo PatchSet2: Shell check PatchSet3: Minor improvements PatchSet4: Rebasing the commit Change-Id: I05fc39236af1bc6f8eabb668304ba5a32dec0737 Signed-off-by: Junaid Ali <junaidali.yahya@gmail.com>
2018-07-09[patch] Drop obsolete OVS port with route supportAlexandru Avadanii2-40/+0
Since we switched all scenarios to using only global gateway settings instead of per-interface routes, drop the obsolete patch for OVS ports with explicit routes. Change-Id: Ibd28849437b598add9847c991e0276b4d0fc505e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-09[patch] MaaS: Switch to upstream fabric/vlan mgmtAlexandru Avadanii3-97/+17
Obsolete our out of tree patch in favor of upstream mechanisms for creating fabrics/VLANs/subnets. Change-Id: I57d6d59764a825b428f423d48c5d90af7f2e676f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[salt-formulas] opendaylight: Fix noproxy caseAlexandru Avadanii1-0/+2
Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[salt-formulas] opendaylight: Adjust keyserver prxAlexandru Avadanii1-6/+4
Align opendaylight/server sls with the latest salt-formula-linux version of keyserver requests support behind proxy. Change-Id: I55f9010eec8b74932d4a28215ecf9647deb3d82c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[docs] Bump release tag to 6.2.1Alexandru Avadanii2-2/+2
Change-Id: I011f34535363d02ef726dfafd6abe0d3c6b4df5f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[apt] Allow downgrades during APT operationsAlexandru Avadanii2-0/+4
Pinning certain packages (e.g. OVS) interfers with `dist-upgrade` if downgrades are not explicitly allowed. Change-Id: I0b001936e86228037c30f30812e32d6221ef458d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-07-02[AArch64] Pin armband repo with highest prioAlexandru Avadanii2-1/+9
Mirantis repositories shadow certain packages from Armband repos (e.g. qemu-efi) if pinning is not set. Since MaaS does not allow configuring repo priorities via its API, use Salt pillar data to re-define the Armband repo and set its prio. Change-Id: Ic743f4b684b3f13552792f5f04097fac73171b37 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Revert "[salt-formulas] Switch to 'testing' dist"Alexandru Avadanii3-3/+3
This reverts commit a8f434118013a69295bdc0f9fc8294c539742c01. This reverts commit b52ef6ea62f43de4b91e2becd92a3282e569925c. Change-Id: I604df3f50febb049f1545a8141c5abb013cf6c69 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29Merge "[patch] MaaS: fabric ID from CIDR"Alexandru Avadanii3-3/+88
2018-06-29[patch] MaaS: fabric ID from CIDRAlexandru Avadanii3-3/+88
Change-Id: I1e1490f4d0a0bee2783450c6369d7ab6c45b193f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29sysinfo_print: Dump all iptables rulesAlexandru Avadanii1-0/+1
Change-Id: I0ce6d21e14efe6e5236759c8d8b3439f09e89675 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-29[salt-formulas] Also switch reclass to 'testing'Alexandru Avadanii2-2/+2
Previous commit only changed the dist during Salt master bootstrap, but failed to update the DEB repo configration in reclass. Fixes: a8f43411 Change-Id: Ie011719cdc1c75cba363f53e51f22ce7cf138a5e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-28[salt-formulas] Switch to 'testing' distAlexandru Avadanii1-1/+1
Nightly repo dist is currently broken. Change-Id: I9235c2c95b4edebf56d20e33932237f18a8e63d5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-06-28[submodule] Bump Pharos for arm-virtual2 ip-rangeAlexandru Avadanii1-0/+0
Change-Id: I77859a2670e07668913232d482853d77cfc8b149 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>