Revert "[Horizon] Drop the obsolete Horizon workaround"

This reverts commit e6685124258ed9d1237acf9d8b383c07f1397f93.

Change-Id: If9ebf7ff149ce0dcf3976e99863e88e5a7ef2c74
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

Merge "Turn off default apache ports" into stable/fraser

Unmask OpenDaylight service explicitly

After salt update to version 2017.7.0 the indefinite mask
has to be removed before attempting to start the service.

Change-Id: I21616929f06f8ebd8a2d70e8c33f92c7b808a9c5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 941a31e1e7f64f38a487b4e493bc25fdf29657da)

Turn off default apache ports

Change-Id: Ie1b427975e7596f6ba0eba953d60b21a907d65c5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 8de9c24300817b9d0ce4f2bfb2ab63643d895a1a)

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: Icc2769f38567072ffa223f715443930f0c18dd1b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

[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>
(cherry picked from commit c52837f7d28b7c0f231be2b0215a7035b26ae302)

[patch] Rebase keyserver support for update logic

Change-Id: Iad2502e876600ba966a38f2df3e71bd579f80e8f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 6269b9ffce8c730eba2a4037075484e007c010b8)

Merge "[patch] Rebase keyserver proxy support" into stable/fraser

[maas] Fix saltstack repo source with arch

This change avoids bug upstream when salt formula tries to
complete the repo entry with arch qualification

Change-Id: I6509bf74bb8f2e69509dfeb63a90434da31e17c2
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>

[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>
(cherry picked from commit 5aca58b8deeec57b22249bb1d386de20ab7c2240)

[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>
(cherry picked from commit 3831d538436cbf7c033b560b76f554a1dfe28a4c)

[salt-formulas] opendaylight: Fix noproxy case

Change-Id: I192cda7412151b2974e1bcd79a51f7593acace5d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit b52c4df4061fd7a51aad94f144bb1326fa8a8b5a)

[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>
(cherry picked from commit 6924fe7e4cadeb5dbe6857adb413d688209bd4e1)

[docs] Bump release tag to 6.2.1

Change-Id: I011f34535363d02ef726dfafd6abe0d3c6b4df5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 61783aec0db25652b11d6858b3103cc12d540b76)

[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>

[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>
(cherry picked from commit d6d2348ee690768101ff661c7811c25d9c65c104)

[patch] MaaS: fabric ID from CIDR

Change-Id: I1e1490f4d0a0bee2783450c6369d7ab6c45b193f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

sysinfo_print: Dump all iptables rules

Change-Id: I0ce6d21e14efe6e5236759c8d8b3439f09e89675
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit fa26dabea271cee86c71b95f7d4650ef53eb2419)

[ha] Add fabric to maas admin subnet

Change-Id: Ida4cf736dfe60886384e7e180d3e43faf811bd58
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 75cbbc689bd9428384f4828f970981da52e92a04)

Update release notes for 6.2

Change-Id: Ibd168ef31af1f8a9a2c128ce8a8e95a5c231a917
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit ea9cf5304b649298c40155714a4374724aec1835)

[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>
(cherry picked from commit fd1f3fa1c8c83b2e5f8cacc6a6caf1a14e40b1a5)

[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>
(cherry picked from commit 79e32c8cc5631204d2e5b0b328c954a2a2197037)

[patch] Rebase APT keyserver proxy support patch

Sync our patch with upstream PR [1].

[1] https://github.com/salt-formulas/salt-formula-linux/pull/138

Change-Id: If3a51d3aef51accee0901c59e1342b42dbe4be4b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 78d368731c9582361cc291d5618e01702982f2b9)

Pin OVN packages

Make a pinning of OVN packages as well to meet an openvswitch dependency.

Change-Id: I96ac7e052c710b65fc1f74bc4f406bba435d433f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

Clean out merged upstream patch

Change-Id: I0c8f87bad0fbe55684bd43547674ed91a31f39f8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 5ab2540591ad029b5b6cf23eab88959fbd14712b)

Merge "[patch] Drop upstream reclass formula patches" into stable/fraser

[submodule] Bump Pharos for ericsson-pod1 updates

This bump also brings in:
- arm-pod{8,9} config;
- UNH lab config;
- NTP config in IDFs for existing PODs;
- basic vPDF support;

Change-Id: Ifc16616bc8a13de2bdf048971448d4853e93880e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 4ee7da0aa1128569bc97e5a28ce10a3ce1aac142)

[patch] Drop upstream reclass formula patches

Change-Id: Iad2a27d059b43ed14fb70bdee01b3db29613615b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 28ccbe4f37cf8b2e38681d4a732f80112888ce84)

Merge "Pin openvswitch packages from UCA" into stable/fraser

Merge "[noha] Disable proxy certificate generation" into stable/fraser

[patch] maas: rebase artifact download

Upstream refactored maas/regions.sls to introduce kitchen tests in
[1], rebase our patches on top of it.

[1] https://github.com/salt-formulas/salt-formula-maas/commit/8a0d52e

Change-Id: I491fb2e05679ebc226a27141e685d429e0ff8bcc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit e2c554c856a923c4a6323c96a190fd82e3d049d7)

Pin openvswitch packages from UCA

Make a pinning of openvswitch packages to get 2.8.1 version.

Change-Id: I2bb78050cebd671ef1dddbac02705e0782fc34c8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

[noha] Disable proxy certificate generation

noha scenarios try to generate the proxy SSL cert using the Salt
Master CA authority. However, this requires a `salt-minion` restart
between the CA configuration and the cert generation (see [1]).
Since we don't use this cert anyway, let's just disable it for cfg01.

JIRA: FUEL-377

[1] https://github.com/salt-formulas/salt-formula-salt/issues/67

Change-Id: I8e88200e0d5614f0034c0c77e6ba675dc7ef0c11
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 016db55bd5cc07d32926b60d59b1fdd7e2471705)

mcp: salt-formulas: opendaylight: AArch64 leveldb

ODL requires native leveldbjni support on architectures like AArch64,
provided as a Debian package in ODL Team Nitrogen PPA.

Only systemd is supported (unlikely to change).

JIRA: ARMBAND-387

Change-Id: Ie7f2955c6574ab4584ed0c207b42ed7ab7261561
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 57175f45f6ae9c2ee2adf02ea30a75c0ab956206)

[maas] Download only used subarches images

- reduce download size/time for MaaS images by downloading only the
  subarch images we use;
- fix stop condition in MaaS artifact download script;
- stop importing images before updating the boot resources to prevent
  race conditions;

Change-Id: I3b15fae3463bc6c54be2cc06e0cb31edcbd307cb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 7f797f1b5a9340d24d700879abca6b39413e7375)

Merge "maas: boot-resources: Dynamic arch list from PDF" into stable/fraser

Merge "[maas] Adopt maas.machines.storage" into stable/fraser

Merge "AArch64: Switch back to hwe-16.04 kernel" into stable/fraser

[Horizon] Drop the obsolete Horizon workaround

Since we switch the Horizon package from
Ubuntu/UCA repo to MCP repos,  we can drop the
obsolete Horizon workaround.

JIRA: FUEL-374

Change-Id: I0b77a4f2158a972a5eb400919f2929c7bd8360cf
Signed-off-by: ting wu <ting.wu@enea.com>
(cherry picked from commit 63b712d1d2052e9dd762a20184913d6394f45ea9)

AArch64: Switch back to hwe-16.04 kernel

Align kernel versions across architectures (where possible).

Change-Id: I66a822611eb5e46f90b62f5d36df571ae75dcba3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 931141e84500695b4a278cc04888b603749a8303)

[maas] Adopt maas.machines.storage

Replace MAAS CLI set_disk_layout with the
new maas.machines.storage state

JIRA: FUEL-364

Change-Id: I4d8cd9f473c5386ee7b32ad378ca1e02989233ca
Signed-off-by: ting wu <ting.wu@enea.com>
(cherry picked from commit 96019123adad087bc0d744a6785ceebb7b21476d)

maas: boot-resources: Dynamic arch list from PDF

Instead of leaving MaaS default to 'amd64', explicitly set the list
of architectures to support based on PDF data.

Change-Id: I852a3ce156db3df0c090f10c0b45c26058dbb6c6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit be45e3157fe19b8905e3a30f7f839a728a6c6df7)

[docs] Update documentation for Fraser-6.1

Change-Id: Ic5e71c0ce2bcfd9d01f07fff017aac8019793527
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit 3f78ef6a2b3cbd7fb509ec12d694b35ff6aad26d)

Revert "[patch] Backport proposed generate_dhparams fix"

This reverts commit c7dff6e1ae6444f60d3fe20b1f495609c7980051.
The patch has been merged into upstream.

Change-Id: Idf768b9b94b3498994601d50feeeef008430ba27
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 7b358ba97fce7925ea6504977ae1c600e3123e3c)

[docs] Update guest OS support matrix

Re-testing the supported operating systems for the guests
revealed that Fedora is now working without problems or user input
on aarch64.

Change-Id: I87dcac2d3297b7a43dd252d4aecfdea4254e519b
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit cc7a243c76b851dc6532433b564f99b1d6ce13c2)

Merge "[xdf] Fix parsing of non-range private vlan(s)" into stable/fraser

[patch] Backport proposed generate_dhparams fix

Upstream PR [1] should fix recently introduced issues with nginx
state for SSL-enabled sites.

[1] https://github.com/salt-formulas/salt-formula-nginx/pull/40

Change-Id: I52b5e4f51539e535249e0850f0b34c2801f4d74a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit c7dff6e1ae6444f60d3fe20b1f495609c7980051)

[maas] AArch64: Preseed Armband repositories

Preseed Armband common repo-comp for Pike, so we get
the updated kernel & other packages from the start.
Requires upstream PR [1].

While at it, also handle related PR merged upstream [2] by
explicitly setting maas.region.subnets name via j2 instead of reclass
param expansion in name (allows us to drop the remaining chunk of the
fabric-from-CIDR patch we used to carry).

Note: opnfv_infra_maas_pxe_network_addres can now be dropped from
pod_config j2 template in Pharos Fuel installer adapter.

[1] https://github.com/salt-formulas/salt-formula-maas/pull/26
[2] https://github.com/salt-formulas/salt-formula-maas/pull/22

Change-Id: I356adb73b80f0f2d85db4ab060e804cb9a053862
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 52af46f2cac395e893007029d24d5365e27a4328)

[xdf] Fix parsing of non-range private vlan(s)

Private (tenant) vlan range support introduced a regression in parsing
PDF/IDF with a single vlan (no range) due to the value being
interpreted as an int instead of string.

Change-Id: Id5d67c4c516a9bb807ffa5e111ead5cbcee7e2ca
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0bc600fd4d269a17ebcf28700b46e199d66c25db)

Merge "Define mongodb admin credentials" into stable/fraser

Update PTL

Election process
https://lists.opnfv.org/pipermail/opnfv-tech-discuss/2018-May/021163.html

Change-Id: Id12673df1797afe0af16812bdf67b8ca8a931626
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit 3cd12952f4fe84357e9daf5df9f28a9c7e00d6aa)

Merge "Auto Generated INFO.yaml file" into stable/fraser

Define mongodb admin credentials

They aren't used by mongodb formula anymore
but still required by salt minion state.

Change-Id: I3168e7934df38c34c5d6889f4332dc1be0415bd7
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

Auto Generated INFO.yaml file

Fix project lead

INFO.yaml meant to be machine readable.
This file was auto generated from an ldap lookup
and your projects INFO file.

Meeting times are not currently filled out.
please ammend this patchset to complete

Going forward comitter promotions should be done
against this file.

PTLs:
Must be merged for you to gain delete access on
testresults.opnfv.org

If project_lead: is missing (my script could not parse)
please amend with same from commiters section eg:

project_lead: &opnfv_dovetail_ptl
    name: 'Lead Name'
    email: 'lead email'
    id: 'lead lfid'
    company: 'lead company'

Cleaned up commiter list:
Jonas Bjurel – resigned
Guo, Ruijing – resigned
Stefan Berg – inactive last commit September 2016
Daniel Smith – inactive last commit June 2016
Szilard Cserey - inactive last commit Nov 2015
Michal Skalski: - inactive last commit August 2017
Nikolas Hermanns -inactive last commit  August 2016

Change-Id: I085ce063906f5596fdab0c9ece520ecb45c7e309
Signed-off-by: agardner <agardner@linuxfoundation.org>
(cherry picked from commit 4530706e6dbe2041edd8682e0e6b9223dc4b8859)

AArch64: Switch to upstream Saltstack repo

To work around the missing dependency of 'python-tornado' on
'python-features' provided by the binary-specific DEB package
in amd64 Saltstack repository, pre-install the req explicitly
on FN (jumpserver) and VCP VMs via lib.sh.

JIRA: ARMBAND-382

Change-Id: I2dbd08a58f6cf57c2c48c2d7fc8d19ad4872e800
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit f15d0275832e59c4e2ac16fa9c066b5771b26dfb)

[odl] Remove unused connecter/port from proxy

Change-Id: I7a880c0a011d6f5f4a7e2d8c8309871b1c290235
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit d97b19bdde59600f588b1e6aca52a6d1962f8778)

Mend OVN scenario

* setup HWE kernel to get suitable conntrack module
* clean out outdated state with ovn ctl options
* point SB remote source to local mgmt network

Change-Id: I8986c227ce0a9a3b7ab3faf382760ec32e6e7c00
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 26ca4c20b57564117087e2c649e10d71477a134f)

[jump] Print CPU, RAM, disk info for debug

JIRA: FUEL-323

Change-Id: I74f92fbdf84762540401fe07a6eb424bdc7aa664
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit b9da44077a589ac8debf12d86d8aefe4be5dc84e)

[maas] Make boot-source-selection ops idempotent

- add `unless` clause;
- instead of adding a new boot sources, update the existing one,
  assuming standard MaaS installation (always updates id '1');

Change-Id: I2db92a3b14d0588095c69545cbb6977ca109613e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit d7ab894b988d8dd6fe49714e0d8d6077e08ebb16)

Merge "[maas] Set boot source selections" into stable/fraser

Run galera state on slave nodes one by one

Apply galera state in consecutive order to avoid
a race condition with database initialization.

Change-Id: I877bad38777d8469c03cee3b7e96acc875a3a72a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 3bc1605a823400a80965f56ed9a502a8ce67b883)

[maas] Set boot source selections

Select xenial image explicitly to avoid getting latest bionic one.

Change-Id: Iee872b8dd2ce309231829a0ad8e5a3cf1a75f796
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 4b28a7bb0097434381e5a0508ee865a2c2fba9c2)

Merge "[states] Catch more transient 'no response' resp" into stable/fraser

[submodule] Bump Pharos for zte-pod1 IDF update

Change-Id: I4942a1c3e12db304db11fbc231ca26ff87e3b6bb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 2d2fbccbc5ae167319a9af636d96efaab8f9ae32)

[docs] Updates for the first Fraser release

Change-Id: I80dfb55c01af89bded1140cd27563d258e05dda4
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit b67b07e5654dbe0c7524e47ebb97eed987edf3d6)

[states] Catch more transient 'no response' resp

Change-Id: Ie8e60a648fa28e59daa6e00f357df52b5821e833
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9e9393ab60ff513f01b9ce045245e6c5808590a8)

Merge "Update qemu/libvirt on compute nodes" into stable/fraser

[doc] Add guest OS support matrix

Update fuel documentation regarding the guest operating systems
that we can boot in both in x86 and aarch64.

Change-Id: Iea96fae880755d0a9cc8fa519362ff564f79e391
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
(cherry picked from commit 1cdebf06e880d7ff75c7700b4e7253206eef1763)

Update qemu/libvirt on compute nodes

Get qemu package with fix of TSC frequency mismatch between instance
and host which breaks up nova pause/unpause operation.

JIRA: FUEL-368
Change-Id: I2c954b2b0a8cddca30c861f565b63b642e0b0e9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0a86dbb986bc0c22fae07dc489c21ce185a5540b)

Merge "Disable cpu pinning & L3 HA features" into stable/fraser

Merge "[ha] Fix tenant NIC OS config for VLAN ranges" into stable/fraser

Merge "[reclass] Parameterize tenant VLAN ranges" into stable/fraser

Add ports to ovs bridge config

To avoid race with interfaces initialization specify all
the ports that belong to a bridge in the config file.

Change-Id: Ie4f48e7a81d4659a0f43749cdd518dbeffe2e35f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 9c9a1adc6f2501507a68b1926ea93efcb40782d1)

Disable cpu pinning & L3 HA features

* CPU pinning: tests have no support for dedicated CPU policy, so
  enabled pinning causes general performance impact
  [https://docs.openstack.org/nova/pike/admin/cpu-topologies.html]
* L3 HA routers:
  - doesn't catch l3-agent failure, relies only on
    HA network state to spot failure
  - failover process only retains the state of network
    connections for instances with a floating IP address
  - incompatible with DVR mode

JIRA: FUEL-360
Change-Id: Ie0182bf953b9989729f89d705d9fee902d229e51
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit ed7bb355c93af5c163d5ae7926012652021abf75)

[ha] Fix tenant NIC OS config for VLAN ranges

Previous commits added support for tenant VLAN range parametrization,
yet failed to accomodate the new VLAN range representation ('M:N') in
existing `linux.network.interfaces` reclass configuration.

This lead to the silent removal of <nic_private>.<vlan_private> from
interfaces file and for `br-mesh` to try to use <nic_private> instead
of <nic_private>.<vlan_private>, conflicting with `br-floating`.

Stick to using the first VLAN in the tenant range.

JIRA: FUEL-365

Change-Id: I88f7263159f1742dba3b6e36649c9344f2932c5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit cfc5988be48d1317244e71fd7919480db18745d4)

[reclass] Parameterize tenant VLAN ranges

Instead of hardcoding the VLAN ranges in reclass, read them from IDF.
This is required when VLAN segmentation is used instead of VXLAN, as
lab switches should be configured appropiately (e.g. Armband PODs use
VLANs 2000+ instead of 1000-1030).

Change-Id: I009ccea9b328c40f055a745791eafe3393b96390
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit aa199b5e96f91111d96f53040be00736cd9309be)

Merge "[baremetal] cmp linux.system: catch 'no response'" into stable/fraser

[baremetal] cmp linux.system: catch 'no response'

Catch & retry transient errors / timeouts while applying the
`linux.system` state on cmp nodes.

Change-Id: Id314b5a29673e0bcaa78611fc787491056830952
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 67b7248e3cc8550ebd757ebb48e2536770f073f8)

[MaaS] destructive storage test fio on failure

Perform fio storage destructive test operation (usually takes just a
few minutes) to completely destroy any previous storage metadata that
might cause issues with cleanup in cloud-init/curtin during deploy.

Only resort to fio when a node fails to deploy, which allows us to
reuse the `maas.machines.mark_broken_state` state.

JIRA: FUEL-365

Change-Id: Ief327e6b4fefa83a8a3c131acfdf9f5fd605689d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 3d6c3323256d6dde62ea335e53427410f730a192)

Build in opendaylight service mask

Oxygen has an issue with broken config/data cache caused
by service restart in the middle of initial boot.

Change-Id: Ia30c76b67566ab8a2fb9045d0e10ca788f1a06a6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 2d2f59907d578d266e1aa19040314dc15b27c0c6)

[submodule] Bump Pharos

Change-Id: Ib5f7a9d7874704b11b10cdc1eefaae19de2a629e
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit ef46d8af46c861bdff5ba835bd89b97b334ea45c)

Clean up opendaylight configuration

* remove client patch (has been merged to upstream)
* websocket now is disabled by default
* purge deprecated/unneeded features (odl-mdsal-apidocs, odl-dlux-all)

Change-Id: Id247a3c74e66730049bfeafc4a5164aad0d9b662
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0a8568d9f170d6c3b42d2dd35db440b4251f9a5d)

Merge "[UCA] Stop enforcing repository architecture" into stable/fraser

Merge "Update opendaylight version to oxygen" into stable/fraser

Update opendaylight version to oxygen

JIRA: FUEL-362
Change-Id: Ib2621bca72d1ba376af5d369edcf5fcf37e9788b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit c1889c963bbe9b21645057e6e9cfcbe9c5f6434d)

[UCA] Stop enforcing repository architecture

Let APT automatically choose the UCA/Pike-staging PPA architecture
based on current system architecture instead of hardcoding it.

Change-Id: I4fe645847ac0fb70a852477feba9f788fcb8da81
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 9cac6117a760279b6be83034f5634f5505032cc0)

[virtual] Set vnc address to local one

System reclass model assigns vnc address to control_address variable
which is used for controller node reference, so change it to local
address of the current compute node.

Change-Id: I0c6b8534a1dae516620d0d250944232379a526e0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 938cb59719ae412e13be8cb21d8c8b5f51a75826)

Merge "Remove opendaylight service mask" into stable/fraser

[submodule] Bump Pharos for Armband IDF changes

Bring in arm-pod5 hugepage configuration et al.

Change-Id: If8a2f9cd84b400c5a8a58fe477f8ef7a12c42bf8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 7f47d25bc3a25ad2cdd564100cdc703ae85702b4)

Remove opendaylight service mask

Nitrogen SR2 brought in weird behaviour into netvirt feature
configuration causing malfunction tunnels between client nodes
(e.g. gateway, computes). In order to work properly service
of opendaylight requires an explicit restart or reload by means
of salt formula.

Change-Id: I277da5ad2787f1005647e500b64c7ffa6051443b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 3fdf9a951e8c7f5387b90d020ea6db38d85f3dd4)

Merge "[odl] Configure Odl memory requirements"

Merge "Add pike staging repository"

[odl] Configure Odl memory requirements

Odl scripts present in /opt/opendaylight crash with
out-of-memory errors and we cannot use them so we add more memory
to the ODL virtual machine and to the JVM.

Change-Id: Ia29a324ca34b5d33e947ca6d177ce3567316dcb9
Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>

Re-order opendaylight state

* return back opendaylight state after neutron setup
* sleep for awhile to let neutron api reconnect to the ODL
  controller and agents to register on server

Change-Id: Ife0c7d3cc20574b0733e8e3064843c680379cc84
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

[odl] Fire up ovs host config after other settings

Change-Id: I9a42e0373f551da9f5c968ae169e0eff1a58972e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

Add pike staging repository

Append PPA repository to the existing UCA
Existing UCA repository is still necessary for maas

Change-Id: If545b37d30291d3708430c52593b7fbd03bd22e4
Signed-off-by: Delia Popescu <delia.popescu@enea.com>

[odl] Setup manager target after ovs host config

Change-Id: Ia517b7cf1723a5afaf43cb0709716f3a67a29e9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

Merge "[doc] installation guide update: PDF section"

[doc] installation guide update: PDF section

Update PDF section to:
1. describe "net_config" section in IDF.
2. describe compute parameterizaion required in IDF for
   both DPDK and non-DPDK scenario.

JIRA: ARMBAND-361

Change-Id: I63fbe79c5cc3a4ee5244e6a0efad57eb89aad7d2
Signed-off-by: ting wu <ting.wu@enea.com>

Apply opendaylight state after ovs host config

* employ GA kernel for baremetal computes as well
* setup/start opendaylight server after ovs host config

Change-Id: Ic772aed544b17be02e6ca9ccd175f2288b2128a8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>