summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-08-16Fix barbican integration on compute nodesDelia Popescu5-3/+4
Locally overwriting barbican_integration_enable on compute nodes does not work. Set barbican_integration_enable to true by default. Disable barbican_integration at openstack_control side. While at it, enable barbican on ha scenarios too. JIRA: FUNCTEST-981 Change-Id: I3c8df5d4078f73f32f3605dec5a7a365fa386019 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2018-08-10[noha] Add mas01 reclass inheritanceAlexandru Avadanii11-7/+66
While at it, move openstack_version param to the common include dir. JIRA: FUEL-382 Change-Id: I5e7ebb18a95672f066126d3afd28f13395a3149f Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-09[IDF] infra VMs: Allow trunking mgmt networkAlexandru Avadanii4-2/+30
Due to design limitations in idf.net_config, for a hybrid POD we need to trunk certain network segments for the VMs running on the jumpserver, including mgmt network going to cfg01, mas01. Add mgmt VLAN support for cfg01, mas01 gated by a flag in IDF: idf.fuel.jumphost.trunks.mgmt: True JIRA: FUEL-338 Change-Id: I6903f9b70e5f8a88618bce28e21c7c0631a05065 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-09Update Salt version to 2017.7Michael Polenchuk4-7/+7
Salt 2016.x has a bug with states ordering coming from 'include' statement. Glance/Heat DB sync is applied before package setup although clearly specified 'require' in state. Change-Id: Ic5f7ce4a7623fb208c0a5ba366802b7e02fa8b9f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2018-08-09[ha] Fix openstack_ha ovn setupGuillermo Herrero1-1/+2
Fix targeting for neutron.compute sls for ovn computes, avoiding interaction with ovs dpdk scenarios. JIRA: FUEL-329 Change-Id: Iffb07f6f0d4dc8071437adf59d4cd6982113b998 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
2018-08-08Merge "[maas] Adopt node role from scenario definitions"Alexandru Avadanii1-2/+4
2018-08-08Merge changes from topic 'baremetal-noha'Alexandru Avadanii7-2/+42
* changes: [scenarios] noha: Add MaaS VM, state to scenarios [states] baremetal_init: dist_upgrade=True
2018-08-08Merge changes from topic 'baremetal-noha'Alexandru Avadanii12-99/+137
* changes: [states] baremetal_init: Parameterize kvm hosts [scenarios] Differentiate virtual node roles
2018-08-08Merge "Enable barbican itegration on compute nodes"Alexandru Avadanii3-0/+38
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-07Enable barbican itegration on compute nodesDelia Popescu3-0/+38
Configure barbican for cinder-volumes and nova-compute to use encrypted volumes Disable default glance image signature verification with barbican enabled JIRA: FUNCTEST-981 Change-Id: I35660234526780a2277e459f3fa21a67d96ce7d7 Signed-off-by: Delia Popescu <delia.popescu@enea.com>
2018-08-07[maas] Adopt node role from scenario definitionsAlexandru Avadanii1-2/+4
Instead of hardcoding kvm hostnames in maas machine definitions, read node roles/hostnames from current scenario and map them accodingly. JIRA: FUEL-382 Change-Id: I15d52e299e0353971f8d0c7da853c571ad5410da Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07[scenarios] noha: Add MaaS VM, state to scenariosAlexandru Avadanii6-1/+41
JIRA: FUEL-382 Change-Id: Ib1f905bec87ce2afe643b4aa3b0201d7100be16d Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07[states] baremetal_init: dist_upgrade=TrueAlexandru Avadanii1-1/+1
JIRA: FUEL-382 Change-Id: I9ace928ec5e04bee7ea9cfe1593b205802d7058a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07[states] baremetal_init: Parameterize kvm hostsAlexandru Avadanii2-11/+16
Instead of hardcoding the 'kvm' hostnames, use new targeting mechanism based on scenario-specific node names, preparing for baremetal noha scenario integration. JIRA: FUEL-382 Change-Id: If336aa1ac130749e4df7bffaf27a55513dd4f267 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2018-08-07[scenarios] Differentiate virtual node rolesAlexandru Avadanii11-88/+121
Split scenario yaml definitions for virtual.nodes based on node role ('infra', 'control' or 'compute'), to be leveraged later to contruct node lists based on said role. This moves the responsability of filtering node names in scenario files (based on 'virtual' or 'baremetal' type) to xdf_data.sh.j2, simplifying scenario templates. By keeping all nodes (both virtual and baremetal) in scenario files, we can later determine the role (and implicitly the hostname) for a MaaS-managed node based on its index in the virtual.nodes.control structure. JIRA: FUEL-382 Change-Id: I1f83a307631f4166ee1c57ef598c44876b962f97 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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>