Alexandru Avadanii [Sat, 4 Aug 2018 05:29:15 +0000 (07:29 +0200)]
[noha] Parameterize network configuration
- odl01: Use a bridge for br-ctl to allow tagged mgmt;
- ctl01: Use bridges for br-ctl, br-ext;
- ctl01: Use mtu 1500 since jumbo frames seems to break nova cell
discovery;
JIRA: FUEL-382
Change-Id: I9bf48711930cac77a089e4d7b7ba98924dd161ee
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Wed, 15 Aug 2018 10:07:32 +0000 (14:07 +0400)]
Turn off default apache ports
Change-Id: I0377615ff19e39aca74b90d2ff7e7b2cd5cd6ccb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Tue, 14 Aug 2018 11:30:43 +0000 (11:30 +0000)]
Merge "[states] virtual control plane: dist_upgrade=True"
Alexandru Avadanii [Tue, 14 Aug 2018 11:29:31 +0000 (11:29 +0000)]
Merge "[jump] Enable jumbo frames for vnet devices"
Alexandru Avadanii [Mon, 13 Aug 2018 17:10:50 +0000 (19:10 +0200)]
[jump] Enable jumbo frames for vnet devices
By default, vnet devices have a MTU of 1500 on the host side, causing
issue with larger packets traversing the bridges between guest VMs
when guest VMs have jumbo frames enabled.
JIRA: FUEL-336
JIRA: FUEL-367
JIRA: FUEL-382
[1] http://linuxaleph.blogspot.com/2013/01/
how-to-network-jumbo-frames-to-kvm-guest.html
[2] https://packetpushers.net/udev/
Change-Id: I941ac9cf764e3b3fa2d6463be5363b5459775f29
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 13 Aug 2018 15:23:12 +0000 (17:23 +0200)]
[states] virtual control plane: dist_upgrade=True
Change-Id: I9c5c6cf564245d497d5916cc7f902ac277105bc6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 13 Aug 2018 14:08:38 +0000 (16:08 +0200)]
[reclass] noifupdown for cluster nodes PXE/admin
Instead of applying PXE/admin static IPs via Salt right away,
delay the transition from DHCP until after node reboot to avoid
duplicate IPs and networking issues during deployment.
Change-Id: I8a12d78a6b42edc9bcf9eb9ebc9590e2af5ec52c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 5 Aug 2018 04:37:12 +0000 (06:37 +0200)]
[noha] Add mas01 reclass inheritance
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>
Alexandru Avadanii [Mon, 6 Aug 2018 21:30:29 +0000 (23:30 +0200)]
[IDF] infra VMs: Allow trunking mgmt network
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>
Michael Polenchuk [Thu, 9 Aug 2018 09:49:13 +0000 (13:49 +0400)]
Update Salt version to 2017.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>
Guillermo Herrero [Wed, 8 Aug 2018 12:36:28 +0000 (14:36 +0200)]
[ha] Fix openstack_ha ovn setup
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>
Alexandru Avadanii [Wed, 8 Aug 2018 13:22:12 +0000 (13:22 +0000)]
Merge "[maas] Adopt node role from scenario definitions"
Alexandru Avadanii [Wed, 8 Aug 2018 13:21:58 +0000 (13:21 +0000)]
Merge changes from topic 'baremetal-noha'
* changes:
[scenarios] noha: Add MaaS VM, state to scenarios
[states] baremetal_init: dist_upgrade=True
Alexandru Avadanii [Wed, 8 Aug 2018 11:03:17 +0000 (11:03 +0000)]
Merge changes from topic 'baremetal-noha'
* changes:
[states] baremetal_init: Parameterize kvm hosts
[scenarios] Differentiate virtual node roles
Alexandru Avadanii [Wed, 8 Aug 2018 07:47:42 +0000 (07:47 +0000)]
Merge "Enable barbican itegration on compute nodes"
Alexandru Avadanii [Tue, 7 Aug 2018 13:19:13 +0000 (13:19 +0000)]
Merge changes from topics 'baremetal-noha', 'move-maas-classes'
* 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
Delia Popescu [Tue, 7 Aug 2018 08:43:11 +0000 (11:43 +0300)]
Enable barbican itegration on compute nodes
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>
Alexandru Avadanii [Sun, 5 Aug 2018 05:44:09 +0000 (07:44 +0200)]
[maas] Adopt node role from scenario definitions
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>
Alexandru Avadanii [Sat, 4 Aug 2018 16:10:13 +0000 (18:10 +0200)]
[scenarios] noha: Add MaaS VM, state to scenarios
JIRA: FUEL-382
Change-Id: Ib1f905bec87ce2afe643b4aa3b0201d7100be16d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 6 Aug 2018 22:06:27 +0000 (00:06 +0200)]
[states] baremetal_init: dist_upgrade=True
JIRA: FUEL-382
Change-Id: I9ace928ec5e04bee7ea9cfe1593b205802d7058a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 4 Aug 2018 16:32:45 +0000 (18:32 +0200)]
[states] baremetal_init: Parameterize kvm hosts
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>
Alexandru Avadanii [Sun, 5 Aug 2018 17:36:01 +0000 (19:36 +0200)]
[scenarios] Differentiate virtual node roles
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>
Alexandru Avadanii [Mon, 6 Aug 2018 17:16:31 +0000 (19:16 +0200)]
[ha] Bind cinder volume I/O on mgmt network
JIRA: FUEL-367
Change-Id: I9a4171d2616af5ae1bafbf1740fd7c7f97c1768e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 5 Aug 2018 17:20:04 +0000 (19:20 +0200)]
[noha] cinder: Align VG name with HA scenarios
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>
Alexandru Avadanii [Sun, 5 Aug 2018 07:57:44 +0000 (09:57 +0200)]
[reclass] Move system.single class to common
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>
Alexandru Avadanii [Sun, 5 Aug 2018 04:24:54 +0000 (06:24 +0200)]
[maas] Add reclass storage definitions for all
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>
Alexandru Avadanii [Sat, 4 Aug 2018 16:46:48 +0000 (18:46 +0200)]
[reclass] Move MaaS classes to common dir for NOHA
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>
Alexandru Avadanii [Mon, 6 Aug 2018 13:54:33 +0000 (13:54 +0000)]
Merge "[lib.sh] Reset virtual nodes after MaaS install"
Alexandru Avadanii [Mon, 6 Aug 2018 12:33:24 +0000 (14:33 +0200)]
[patch] Rebase keyserver patch for disabled repos
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>
Alexandru Avadanii [Thu, 2 Aug 2018 00:59:12 +0000 (02:59 +0200)]
[lib.sh] Reset virtual nodes after MaaS install
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>
Alexandru Avadanii [Thu, 2 Aug 2018 15:32:27 +0000 (17:32 +0200)]
[lib.sh] Support older jumpserver libvirt
`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>
Alexandru Avadanii [Thu, 2 Aug 2018 15:37:45 +0000 (17:37 +0200)]
[states] openstack_ha: Retry rabbitmq state
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>
Alexandru Avadanii [Fri, 3 Aug 2018 13:39:53 +0000 (13:39 +0000)]
Merge "[ha] AArch64: Add missing GPG key for armband repo"
Alexandru Avadanii [Fri, 3 Aug 2018 11:59:12 +0000 (13:59 +0200)]
[patch] Rebase keyserver support for update logic
Change-Id: Iad2502e876600ba966a38f2df3e71bd579f80e8f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 2 Aug 2018 14:12:27 +0000 (16:12 +0200)]
[ha] AArch64: Add missing GPG key for armband repo
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>
Alexandru Avadanii [Thu, 2 Aug 2018 14:03:56 +0000 (14:03 +0000)]
Merge "[ha] Add OVN scenario"
Guillermo Herrero [Tue, 22 May 2018 12:42:02 +0000 (14:42 +0200)]
[ha] Add OVN scenario
JIRA: FUEL-329
Change-Id: I46c7dbc791441c6b069a0d56373ff98a32a57e60
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Alexandru Avadanii [Wed, 1 Aug 2018 21:45:16 +0000 (23:45 +0200)]
[maas] Allow more than two compute nodes
Change-Id: Ie023bfe7b322a49a8b525e7926518c94899c67ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Fri, 27 Jul 2018 11:36:15 +0000 (15:36 +0400)]
[ovn/noha] Simplify net scheme on compute nodes
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>
Michael Polenchuk [Mon, 30 Jul 2018 12:25:37 +0000 (12:25 +0000)]
Merge "[odl/noha] Simplify net scheme on compute nodes"
Michael Polenchuk [Mon, 30 Jul 2018 09:11:03 +0000 (13:11 +0400)]
[patch] Rebase keyserver proxy support
https://github.com/salt-formulas/salt-formula-linux/commit/
f27f436
Change-Id: I9662dcff23c363430b6a04808f4e03617a10c160
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 27 Jul 2018 11:08:59 +0000 (15:08 +0400)]
[odl/noha] Simplify net scheme on compute nodes
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>
Michael Polenchuk [Fri, 27 Jul 2018 06:20:32 +0000 (10:20 +0400)]
[noha] Bind cinder volume I/O on mgmt network
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>
Michael Polenchuk [Thu, 26 Jul 2018 06:41:29 +0000 (06:41 +0000)]
Revert "[salt master] Disable broken _orchestration.conf"
This reverts commit
8ac1c0fa491ab5de2eaf128374f9c73202df1751.
Upstream commit has been reverted,
Change-Id: I3b20edd450034dc79ef15b46c1ff845f81aaf981
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 26 Jul 2018 04:40:37 +0000 (04:40 +0000)]
Merge "Bring in Barbican service onboard"
Alexandru Avadanii [Wed, 25 Jul 2018 22:08:28 +0000 (00:08 +0200)]
[salt master] Disable broken _orchestration.conf
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>
Alexandru Avadanii [Tue, 24 Jul 2018 11:10:21 +0000 (11:10 +0000)]
Merge "[salt-formulas] opnfv: Drop obsolete route_wrapper"
Michael Polenchuk [Wed, 27 Jun 2018 14:11:35 +0000 (18:11 +0400)]
Bring in Barbican service onboard
Change-Id: I68759360c9dd8f8cf422161e21ed15df6c694e84
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 23 Jul 2018 15:12:45 +0000 (17:12 +0200)]
[MaaS] Arch-qualify Saltstack repo for Xenial
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>
Michael Polenchuk [Wed, 18 Jul 2018 10:07:50 +0000 (14:07 +0400)]
Rectify control address on compute nodes
Change-Id: I5734431d54c0d0ad9fb337fc37ce3b31a3c58e0a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 20 Jul 2018 08:52:05 +0000 (12:52 +0400)]
Align SDN credentials variables
Change-Id: I731abc6871ddd845b551a837e942d2a2d77a67ee
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 19 Jul 2018 17:12:30 +0000 (17:12 +0000)]
Merge "[maas] Change saltstack repo source format"
Michael Polenchuk [Thu, 19 Jul 2018 15:37:19 +0000 (15:37 +0000)]
Merge "Set OpenDaylight REST port in openrc"
Michael Polenchuk [Thu, 19 Jul 2018 11:42:36 +0000 (15:42 +0400)]
[maas] Change saltstack repo source format
Change-Id: I2a25734258f34ed02da584456a3a3dac70e24af3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 18 Jul 2018 10:49:22 +0000 (14:49 +0400)]
Set OpenDaylight REST port in openrc
JIRA: FUEL-380
Change-Id: I16039f6a0397f761e4cfa58be4cd45fd0beab925
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Tue, 3 Jul 2018 12:36:08 +0000 (14:36 +0200)]
[salt-formulas] opnfv: Drop obsolete route_wrapper
Change-Id: I84a4789ff2155d7c14f9ffd9bfe54c5bca7a0d4f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Junaid Ali [Tue, 10 Jul 2018 14:39:50 +0000 (15:39 +0100)]
[salt.sh] Ignoring files using rsync
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>
Alexandru Avadanii [Tue, 3 Jul 2018 12:19:50 +0000 (14:19 +0200)]
[patch] Drop obsolete OVS port with route support
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>
Alexandru Avadanii [Mon, 9 Jul 2018 11:25:28 +0000 (13:25 +0200)]
[patch] MaaS: Switch to upstream fabric/vlan mgmt
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>
Alexandru Avadanii [Mon, 2 Jul 2018 19:30:21 +0000 (21:30 +0200)]
[salt-formulas] opendaylight: Fix noproxy case
Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 2 Jul 2018 16:17:46 +0000 (18:17 +0200)]
[salt-formulas] opendaylight: Adjust keyserver prx
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>
Alexandru Avadanii [Mon, 2 Jul 2018 14:30:23 +0000 (16:30 +0200)]
[docs] Bump release tag to 6.2.1
Change-Id: I011f34535363d02ef726dfafd6abe0d3c6b4df5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 2 Jul 2018 13:50:27 +0000 (15:50 +0200)]
[apt] Allow downgrades during APT operations
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>
Alexandru Avadanii [Mon, 2 Jul 2018 12:45:57 +0000 (14:45 +0200)]
[AArch64] Pin armband repo with highest prio
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>
Alexandru Avadanii [Fri, 29 Jun 2018 16:20:37 +0000 (18:20 +0200)]
Revert "[salt-formulas] Switch to 'testing' dist"
This reverts commit
a8f434118013a69295bdc0f9fc8294c539742c01.
This reverts commit
b52ef6ea62f43de4b91e2becd92a3282e569925c.
Change-Id: I604df3f50febb049f1545a8141c5abb013cf6c69
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 29 Jun 2018 16:12:36 +0000 (16:12 +0000)]
Merge "[patch] MaaS: fabric ID from CIDR"
Alexandru Avadanii [Thu, 28 Jun 2018 21:14:02 +0000 (23:14 +0200)]
[patch] MaaS: fabric ID from CIDR
Change-Id: I1e1490f4d0a0bee2783450c6369d7ab6c45b193f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 27 Jun 2018 14:42:28 +0000 (16:42 +0200)]
sysinfo_print: Dump all iptables rules
Change-Id: I0ce6d21e14efe6e5236759c8d8b3439f09e89675
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 28 Jun 2018 22:02:37 +0000 (00:02 +0200)]
[salt-formulas] Also switch reclass to 'testing'
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>
Alexandru Avadanii [Thu, 28 Jun 2018 21:33:57 +0000 (23:33 +0200)]
[salt-formulas] Switch to 'testing' dist
Nightly repo dist is currently broken.
Change-Id: I9235c2c95b4edebf56d20e33932237f18a8e63d5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 28 Jun 2018 18:55:45 +0000 (20:55 +0200)]
[submodule] Bump Pharos for arm-virtual2 ip-range
Change-Id: I77859a2670e07668913232d482853d77cfc8b149
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Cristina Pauna [Wed, 27 Jun 2018 08:50:38 +0000 (11:50 +0300)]
Update release notes for 6.2
Change-Id: Ibd168ef31af1f8a9a2c128ce8a8e95a5c231a917
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Alexandru Avadanii [Tue, 26 Jun 2018 11:21:14 +0000 (11:21 +0000)]
Merge "[noha] Adopt vPDF usage"
Alexandru Avadanii [Tue, 26 Jun 2018 10:33:08 +0000 (10:33 +0000)]
Merge "[ha] Add fabric to maas admin subnet"
Michael Polenchuk [Mon, 25 Jun 2018 17:42:26 +0000 (21:42 +0400)]
[ha] Add fabric to maas admin subnet
Change-Id: Ida4cf736dfe60886384e7e180d3e43faf811bd58
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Mon, 25 Jun 2018 16:57:01 +0000 (20:57 +0400)]
[ha] Pin UCA's libvirt/qemu on computes
* install libvirt/qemu packages only from UCA on computes
* shift panko/aodh db settings to telemetry nodes
Change-Id: I0f4434aa8d2139870afaed9d9831db0a9af10e51
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Fri, 8 Jun 2018 17:10:00 +0000 (19:10 +0200)]
[noha] Adopt vPDF usage
Previously, all virtual deployments relied on lab configuration from
<./mcp/config> using 'local-virtual1' as POD name.
To keep using that default sample config, one can still pass the
appropiate arguments to <ci/deploy.sh> as in:
$ ./ci/deploy.sh -l local -p virtual1 [...]
This changed introduces support for vPOD-specific lab config, e.g.:
$ ./ci/deploy.sh -l ericsson -p virtual4
Change-Id: I6ecb8e71d7e923e4b29b4ab0693c1afa5e19b582
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 19 Jun 2018 14:34:20 +0000 (16:34 +0200)]
[MaaS] Adopt boot-resources control from maasng
JIRA: FUEL-364
Change-Id: I891514f85cf694509003a3b0a6f3568524d0a461
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Fri, 22 Jun 2018 12:57:44 +0000 (16:57 +0400)]
[ha] Update pymysql to version 0.8
* get latest pymysql from UCA repo
* set DB connection recycle time to avoid issue with broken database
connection during query (MySQL server has gone away)
* set haproxy source balacing mode for neutron API to avoid race
condition with duplicate security groups
* get libvirt/qemu from UCA repo on compute nodes since main process
of libvirt exits (is killed by 11/SEGV [segfault]) during volume
attaching operation
Change-Id: Iead5ecc561683876c476357f4a4de8780775aa7b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 21 Jun 2018 15:31:03 +0000 (17:31 +0200)]
[submodule] Bump Pharos for unh-pod1 updates
Change-Id: Ic6705c64dd3582b562e96ff79fd7fc83789533a6
Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 21 Jun 2018 14:56:20 +0000 (16:56 +0200)]
[ha] cmp: Fix duplicate PXE/admin IDs (2)
Certain scenarios build additional interface definitions which
overlap with the ones from common-ha reclass dir.
Extend previous fix to scenario-specific interface definitions
to prevent such duplicates.
Change-Id: I57b175e2f760a22454723266b044845335af4cfe
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 20 Jun 2018 16:28:03 +0000 (18:28 +0200)]
[MaaS] curtin: Switch back to Salt 2016.11 repo
Change-Id: I7482a3b7045e6e1e94d6abfe2dc6b862f2176a53
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Wed, 20 Jun 2018 12:06:14 +0000 (16:06 +0400)]
[noha] Rectify opendaylight+dpdk scenario
Change-Id: Ie707de90617e7080a5eb87cad69a604cf5e0f9fc
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Wed, 20 Jun 2018 12:24:16 +0000 (14:24 +0200)]
[ha] cmp: Fix duplicate PXE/admin interface IDs
Change-Id: I99a8acfbfdddb79493bf3a191835927cef5fd5e3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Tue, 19 Jun 2018 14:24:39 +0000 (18:24 +0400)]
[queens] Update Gnocchi version
Change-Id: Ieea2c510ae4c6d4db0667f3341c877042a2c1846
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Sat, 7 Apr 2018 03:27:48 +0000 (05:27 +0200)]
Enforce static configuration instead of DHCP
- noha: 'accept_policy: open_mode' to align with ha scenarios;
- s/cmp01/cmp001/g to align all scenarios and allow code reuse;
- rename network params: s/dhcp/mcpcontrol/g, cleanup;
- computes XDF data: drop 'opnfv_*' layer of params, cleanup;
- local vPDF: add comments with default roles by node index;
- parameterize all netmasks;
- drop unused address/netmask for 'proto: manual' interfaces;
- virsh_net: cleanup definitions, remove hardcodes, align IP on
jumpserver and DHCP range with MaaS for pxebr;
- maas: parameterize hardcoded '/24' cidr for PXE/admin, refactor
maas.region.machines parameterization;
- merge <all-mcp-arch-common/infra/config_*pdf.yaml.j2> templates;
- move reclass.storage definitions of compute nodes to common dir;
- drop 'openstack_compute_*' reclass params in favor of expanding
them via j2 directly in reclass.storage params;
- adopt `nm.cluster.has_*_nodes` where possible;
- obsolete `runtime.yml` from reclass model;
- refactor arch-specific reclass param selection;
- remove unused defaults in favor of mandatory IDF properties;
- noha: prepare for baremetal node support in cinder_lvm_devices;
- interfaces: add interface_mtu and 'noifupdown: true' everywhere;
- interfaces: use j2 macros to generate eth/vlan config;
- states cleanup: remove DHCP route disable workaround on prx/cmp;
- allow configuring NTP servers via:
`idf.fuel.network.ntp_strata_host{1,2}`;
- ovs_bridge: Allow setting gateway, dns-nameservers
- apache: Adjust module list for novcp class inheritance;
- glusterfs PPA: pin with same prio of MCP repos for novcp scenario;
JIRA: FUEL-319
JIRA: FUEL-326
JIRA: FUEL-337
Change-Id: Ia6ad64ba8cade85a75fb22c9a2505decc3834360
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 18 Jun 2018 14:35:19 +0000 (14:35 +0000)]
Merge "[patch] OVS bridges should not use 'auto'"
Michael Polenchuk [Mon, 18 Jun 2018 12:46:25 +0000 (16:46 +0400)]
Rectify nova placement API check
* make a GET request to placement service as it returns 200 with
version data starting from nova 17.0
* turn on nova image preallocation mode on baremetal computes
* double salt worker threads by number of available CPU
Change-Id: I509cbab3b4b8460452f5e487e457edfedd5da29a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Fri, 15 Jun 2018 22:19:40 +0000 (00:19 +0200)]
[patch] OVS bridges should not use 'auto'
Change-Id: I0db7b9ee5af77f9e2d580c4ace9fa7d7f17c8d85
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Thu, 14 Jun 2018 17:45:29 +0000 (21:45 +0400)]
Get back to salt 2016.11
Change-Id: Id024ed22dd1760f41ae18aeb8e680c2f07a5dc63
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 14 Jun 2018 13:41:13 +0000 (15:41 +0200)]
[patch] Rebase keyserver proxy support (3)
Rebased on top of [1].
[1] https://github.com/salt-formulas/salt-formula-linux/commit/
9f30456
Change-Id: Iad5aef674c47d622a94d1c21cae3f46fbb3c52d8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 12 Jun 2018 13:58:07 +0000 (13:58 +0000)]
Merge "[ha] Fix salt state apply on ctl VCP nodes"
Alexandru Avadanii [Mon, 11 Jun 2018 18:25:48 +0000 (20:25 +0200)]
[ha] Fix salt state apply on ctl VCP nodes
Sphinx metadata collection does not check whether a haproxy server
is enabled or not, so keep full 'heat_cloudwatch_api' configuration
in place to prevent breakage; and just disable it instead.
Change-Id: I9fda1f3d2829b89ea8e425ae831a54484651f60a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 11 Jun 2018 17:27:32 +0000 (19:27 +0200)]
[ha] Retry salt.minion state apply
Baremental compute nodes time out with 'Not connected' or
'No response' while trying to apply `salt.minion` highstate after
the Salt 2017.7 bump, retry applying it up to 5 times.
Change-Id: I67f74c65a7cebe0a0b4c2812fa0ced6c1144be58
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 11 Jun 2018 15:49:45 +0000 (15:49 +0000)]
Merge "Smooth down API proxy config"
Alexandru Avadanii [Mon, 11 Jun 2018 14:36:54 +0000 (14:36 +0000)]
Merge "[state] Stop expecting linux.network failures"
Michael Polenchuk [Sat, 9 Jun 2018 14:22:04 +0000 (18:22 +0400)]
Smooth down API proxy config
* heat: remove deprecated AWS compatible CloudWatch API
* nova: placement API responds with 405 when doing GET to root URL
Change-Id: I545e5b0fc5b57b516a4b1d8c9e33ea1d5d61ed76
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 11 Jun 2018 13:52:32 +0000 (15:52 +0200)]
[patch] Rebase keyserver proxy support
Rebase on top of [1].
[1] https://github.com/salt-formulas/salt-formula-linux/commit/
6f5e69e
Change-Id: Ic34bb9c1fad8778262f2e876c91667e903d143bf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Jun 2018 17:46:12 +0000 (19:46 +0200)]
[state] Stop expecting linux.network failures
Now that the `linux.network` state applies cleanly on all nodes,
stop expecting failures to prevent false-positive passes.
Change-Id: I8a283474e12b85deb95815e4e7a0af4a74d143ac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Jun 2018 15:24:50 +0000 (15:24 +0000)]
Merge "Bring in Tacker salt formula"