Merge "[baremetal] idf support for different board types" into stable/euphrates

[baremetal] idf support for different board types

This modification enables having different models of target nodes
but restricts them to two groups of the same kind assuming:
 - 3 KVMs will be same model and have the same NIC names
 - 2 Compute nodes will be the same model and have same NIC names

This is an ad-hoc change for arm-pod7. Will work for all other setups
but the jinja2 logic should be evetually extended to support a per
board approach, allowing any board to be any kind

Change-Id: Ie994d661e3dbe5b9a33d290a850a6152cf320c86
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit ee149500e0e6bde0152aa56140046a2d1b995eb4)

patches: Drop salt ver sync patch, now upstream

Upstream pull request [1] was merged, drop out patch.

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

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

Add tutorial for reclass-doc tool in documentation

JIRA: FUEL-293

Change-Id: I2612e8d63875dca4d05f8c30db24a5ae84cc8dea
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 94954c13104b7f7e3bd04a7b5fdbae84a93457ac)

Update release notes for 5.1

The release notes are updated with relevant Jira filters and
changes since 5.0

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

[ovs/dpdk] Split out networking restart action

In common openstack_ha state the networking service restart
has no expected effect, so split it out into the detached
post-deployment state.

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

Revert "[baremetal] Migrate public bridge to ovs"

Vlan tagging on ovs+linux ports doesn't work as expected.
This reverts commit c3316c713c936b154b979aa985a400f4b791c0cb.

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

pod_config: cleanup: Drop infra_compute_*_address

Our PDF installer adapter defines 3 unused reclass params that are
misleading, so drop them (infra_compute_node{01,02,03}_address).

Change-Id: I0ca49b73add543c8f03b14ed4d805ce55f973bb5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit e48d4876833270b9139ca8196eef2c13f44effcc)

patches: pharos: Bump & drop upstream patches

All our staged patches for Pharos repo are now upstream, so bump
the git submodule and remove the patch files.

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

Merge "[baremetal] Migrate public bridge to ovs" into stable/euphrates

Merge "submodule: pharos: Bump to fix run without eyaml" into stable/euphrates

submodule: pharos: Bump to fix run without eyaml

Most Fuel PODs do not use encrypted PDFs, so bump Pharos git
submodule to include updated `generate_config.py` to silently
skip decryption in case eyaml is not installed.

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

[baremetal] Migrate public bridge to ovs

Get rid of "ovs-to-linux" links, instead of this setup native ovs
bridge for public interface and link it with neutron external bridge.

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

states: maas: Stop using maas-stable PPA

Currently, Xenial repos provide MaaS 2.2.x, while the PPA bumped it
to 2.3.x. Since we switched to 2.3, we observed a rare wrongful state
transition from 'Deploying' back to 'Ready'.
Drop the PPA, falling back to 2.2 from mainline distro repos.

JIRA: FUEL-312

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

Merge "[baremetal] PDF: Use net_admin for MaaS PXE net" into stable/euphrates

[baremetal] PDF: Use net_admin for MaaS PXE net

While at it, fix another small issue where a variable
(parameters__param_opnfv_maas_pxe_address) was used without being
populated (defined in 'runtime.yml', which is not read using
`parse_yaml`, like the scenario yml or the PDF expanded class,
pod_config.yml).

JIRA: FUEL-313

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

patches: pharos: Drop patches merged upstream

Also, remove redundant pharos patch that adds prx mgmt IPs:
- "Re-assign mgmt network to proxy nodes"
as those values are set already (to different values!) by patch:
+ "extend public gateway support"

While at it, `make patches-export` should clean the patch dir first.

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

lib.sh: persistent cfg01, mas01 mcpcontrol

cfg01, mas01 DHCP leases in mcpcontrol virtual network should be
persistent (if cfg01 IP changes, minions can't find Salt Master).

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

Merge ".gitreview: Add defaultbranch" into stable/euphrates

Merge "[baremetal] package: install python-yaml" into stable/euphrates

.gitreview: Add defaultbranch

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

[baremetal] package: install python-yaml

- Required for PDF parsing

Change-Id: I95205e62efab3e9920687866d3a53a135828a218
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>

Clean up noifupdown support patch

The patch has been merged to upstream linux formula.

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

[baremetal] Restart gateway networking service

Make sure all missing interfaces/links are up & running
(e.g. br-ex <-> float-to-ex <-> br-floating).
Fix (for https://github.com/saltstack/salt/issues/40262)
into linux formula brought in a weird behaviour with
network/interfaces.u/ items.

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

[baremetal] Fix prx stale route via MaaS DHCP

Although we add default routes via public network and disable
DHCP client from setting new routes, until we reboot the prx* nodes
we still have the stale route originally set at initial boot.

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

Revert "[baremetal] Fix maas_subnets without maas_fabrics"

The upstream commit has been merged
https://github.com/salt-formulas/salt-formula-maas/commit/0c622327
This reverts commit 2c48915a1a77aa3ac0133155fd0cdadbf280493d.

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

Merge "Align options of glusterfs nova_instances volume" into stable/euphrates

[baremetal] VCP VM base img: Switch URL to AWS S3

Mirantis prebuilt base image for VCP VMs (used by salt.control on
x86_64) has been moved to a new location on AWS S3.

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

Merge "[baremetal] Retry cinder.controller on failure" into stable/euphrates

[baremetal] Retry cinder.controller on failure

Occasionally, cinderng.volume_type_present errors with:
ClientException: Service Unavailable (HTTP 503)
Instead of retrying the whole state file, use `wait_for` macro
to retry only this high state up to 5 times.

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

[baremetal] MaaS: Fix adding mcp.rsa.pub

Upstream salt-formula-maas change [1] gated applying "maas_sshprefs"
low state by `region.sshprefs` being declared in reclass, which is
not true for our model.
Mend our region.sls patch to pass mcp.rsa.pub to MaaS unconditionally.
This fixes baremetal SSH login with mcp.rsa.

While at it, fix duplicate SSH key upload on MaaS state retry.

JIRA: FUEL-281

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

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

Align options of glusterfs nova_instances volume

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

Revert "Apply apache state on proxy nodes"

Upstream fixed the salt-formula-horizon in commit 95387ec, by
defining 8078 (and only that) port in Apache's ports.conf.
This fixes the port 80 overlap, so running the `apache` high state
after the `horizon` high state not only is unnecessary now, but
also would lead to new breakage, since `apache` state would
overwrite the ports.conf (removing 8078 and adding 80), i.e.
creating a new port conflict and breaking Horizon port completely.

This reverts commit eb4645206d6d74992fca3b8726ee2eebca97205f.

Conflicts:
mcp/config/states/openstack_ha
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml

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

Bring in newer glusterfs for mtime unsplit brain

Recent commit 8ba3a1a (Switch nofeature-ha compute nodes to UCA repo)
bumped the reclass/system submodule and brought in upstream commit
2ee306b (Glusterfs: use automatic mtime-based split-brain resolution)
which requires support for "cluster.favorite-child-policy", not
available in Glusterfs 3.7.x available in Ubuntu Xenial.
NOTE: UCA does not provide glusterfs for "Ocata", only for "Pike"+.

Instead of reverting the commit switching to mtime brain un-split,
bump glusterfs to a version that is not EOL (3.10) using their
official PPA.

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

Merge "docs: Update prx nodes on network diagrams" into stable/euphrates

Merge "salt.sh: Rework `git -C` for older git compat" into stable/euphrates

Merge "Switch nofeature-ha compute nodes to UCA repo" into stable/euphrates

salt.sh: Rework `git -C` for older git compat

CentOS 7.4 provides git 1.8.3, while `git -C` support was introduced
in 1.8.5, so rework <salt.sh> to not rely on this parameter.

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

Merge "ci/deploy.sh: Add new `-E` arg for env erase" into stable/euphrates

[docs] Add MCP user guide

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

docs: Update prx nodes on network diagrams

- prx: added 3rd interface, green dot to mgmt

JIRA: FUEL-302

Change-Id: I9f807409ed7a84de95d7321f059343d5d676038e
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit e62317704bce4985dc12abeb2de729a56397426b)

Switch nofeature-ha compute nodes to UCA repo

Employ UCA repo on computes nodes for nosdn-nofeature-ha scenario as
well to prevent a regression (creation of ports failed for 1+n instances)
of neutron ovs agent from mcp/openstack repos.

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

[baremetal] Fix maas_subnets without maas_fabrics

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

Merge "[virtual] Apply nova controller state twice" into stable/euphrates

ci/deploy.sh: Add new `-E` arg for env erase

NOTE: In order to undefine VCP VMs with NVRAM (e.g. AArch64 VMs
using AAVMF), an additional parameter should be passed to libvirt
by Salt virt core module (equivalent to `virsh undefine --nvram`).

While at it, pass CI_DEBUG, ERASE_ENV enviroment variables to
state execution, and stop force-applying patches.

Also refactor the rsync between foundation node and Salt master,
so the whole git repo is copied as </root/opnfv>, and <root/fuel>
becomes a link to it; useful for Armband, where 'fuel' is a git
submodule. Fix .git paths after rsync, so git submodules work as
expected in cfg01 repos.

JIRA: FUEL-307

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

Merge "[baremetal] public gateway setup on prx nodes" into stable/euphrates

[virtual] Apply nova controller state twice

In order to complete broken database sync run
nova state on controller one more time.

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

[baremetal] public gateway setup on prx nodes

- prx: add route for public traffic to public interface
- prx: add route towards salt master through maas
- remove dashboard class from proxy node (already implements horizon)
- remove dashboard (and benchmark) class definitions (no longer used)
- (temporary) backport Pharos change for adapter template

JIRA: FUEL-305

Change-Id: Ia14a18ac0123c1134d8d99dc43da9a1f770001d0
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit 07f4e0238646fcb77072769feb8a0b68df52caca)

patches: linux.storage.lvm: Disable filter

JIRA: FUEL-304

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

[baremetal] MaaS: Remove curtin netconfig via Salt

JIRA: FUEL-301

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

Merge "[baremetal] Retry keystone.client state on failure" into stable/euphrates

Merge "[baremetal] Re-assign mgmt network to proxy nodes" into stable/euphrates

Merge "Update opendaylight/neutron patch" into stable/euphrates

Merge "[baremetal] SaltStack Deployment Documentation" into stable/euphrates

Merge "Enable neutron trunk ports" into stable/euphrates

[baremetal] Re-assign mgmt network to proxy nodes

- extend arch-specific list of predefined VM iface names (2 -> 3);
- add extra vnet iface for prx0* VCP VMs, connected to br-ctl (mgmt);
- add mgmt address to pod_config.yml template (and sample);
- add mgmt address to reclass.storage prx nodes;

JIRA: FUEL-302

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

[baremetal] Retry keystone.client state on failure

JIRA: FUEL-306

Change-Id: I648545890c1f7dc59176beac1a0593aed54079cb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
(cherry picked from commit dcbc90f89292bf5070e8e0b54a760755b8206346)

Update opendaylight/neutron patch

Align opendaylight support patch with latest neutron formula.
Employ native ML2 backend/engine option as is instead of bringing
in the "opendaylight" keyword into reclass model.
Unfreeze the maas & neutron formulas versions.

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

AArch64: deploy.sh: Add AAVMF install prereq

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

Merge "deploy.sh: Check hypervisor after prereq install" into stable/euphrates

Enable neutron trunk ports

The network trunk service allows multiple networks to be
connected to an instance using a single virtual NIC.

JIRA: FUEL-303
Change-Id: Id9e7c122bc1a32a59f18167e332ceaaa3897b5ef
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 66e745c73ac2aba1ef93ba90db4b167e49813863)

[baremetal] SaltStack Deployment Documentation

Generate documentation automatically using `reclass-doc`.
nginx is already configured to serve said documentation on
proxy's public VIP on port 8090.

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

docs: Add details to the installation instruction

Added some text details to the diagrams from
https://gerrit.opnfv.org/gerrit/#/c/46801/

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

deploy.sh: Check hypervisor after prereq install

On a clean system (i.e. no libvirt installed), the prerequisites
should be installed first, before checking for hypervisor access.

While at it, add 'libvirt' to the list of prerequisites, as it is
not automatically required by the others.

Add a note in the documentation about libvirtd service not being
automatically started after installation on CentOS.

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

salt formulas: Pin via reclass instead of salt.sh

Previous commit pinned the salt-formula-package by installing a
specific version after OPNFV-specific patches were applied by
`patch.sh`. To prevent patch bypass, move the pin to reclass model.

While at it, also move salt-formula-neutron pinning to reclass to
bypass wrong minimum length of 2 for version-pinned formula pkgs.

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

Merge "salt.sh: Pin MaaS formula to last known stable ver" into stable/euphrates

[baremetal] prx: Fix empty Apache module list

On low state expansion, apache.server.modules is iterated, and
since reclass transforms '~' into 'null', an exception is thrown.

Use an empty string instead (different type will still ensure reclass
overrides variables from apache service instead of merging the lists).

While at it, add missing version 'latest' for mod-wsgi pkg.

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

salt.sh: Pin MaaS formula to last known stable ver

Recent upstream changes broke MaaS machine status parsing. Pin
the formula to the previous version until upstream provides a
fixed package or a repo snapshot baseline.

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

Merge "Apply apache state on proxy nodes" into stable/euphrates

Merge "lib.sh: Cleanup previous /boot/efi contents" into stable/euphrates

Merge "docs: add Pod Descriptor Files information" into stable/euphrates

Apply apache state on proxy nodes

Apache module will take care of ports.conf file to prevent
bind socket conflict between apache & nginx services.

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

docs: add Pod Descriptor Files information

Change-Id: I9ca83d2bc42cb15cd37aa3726c02c458fb8a0ea3
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit a9d51e138de235fe98ba686a8ef0ad22e2e975d5)

Handle vlan package to avoid downgrade

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

lib.sh: Cleanup previous /boot/efi contents

Some UEFI firmwares insist on scanning removable drives, even when
boot entries were deleted from UEFI boot list (board flash).

To work around this, remove contents of </boot/efi/*>, so scanning
won't identify any valid EFI binaries.
Another option would be erasing partition tables, but identifying
the underlying disk(s) is more complicated, especially when using
LVM/RAID etc.

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

MaaS: Fix conflicting curtin network config

JIRA: FUEL-301

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

Merge "salt modules: debian_ip: Accept uppercase ifaces" into stable/euphrates

Merge "Enable glance v1 api for orchestra tests" into stable/euphrates

Merge "[maas] Conform regex to machines status output" into stable/euphrates

docs: Add network layout example diagrams

JIRA: FUEL-295

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

[maas] Conform regex to machines status output

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

Enable glance v1 api for orchestra tests

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

salt modules: debian_ip: Accept uppercase ifaces

Since VMs are not affected by this limitation, only apply the fixup
to baremetal nodes.

JIRA: FUEL-299

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

Merge "[virtual] Horizon: server: secure = False" into stable/euphrates

Connect proxy nodes to public network

cloudify vnf requires public enpoints to be available from instance
with manager, so connect nodes w/ nginx to routed public network.

JIRA: FUEL-286
Change-Id: Id0caa699519b9b46dad51deac6955afe6a0050de
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 0861ea0799114d9c59499f2c52a9c7a79fb1bbb7)

[virtual] Horizon: server: secure = False

Horizon login fails due to CSRF_COOKIE_SECURE being set when no SSL
is available.

JIRA: FUEL-297

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

lib.sh: rm Ubuntu boot entry on EFI systems

On EFI-enabled systems, grub-install from grub-efi-* package
installs a boot entry named "ubuntu".

MaaS relies on IPMI to set boot order to PXE first; however
on systems with buggy firmware or without full IPMI support,
that fails, leading to booting Ubuntu from hard disk instead.

Work around this by clearing any previous Ubuntu boot entry
from board flash, before starting a new baremetal deploy.

NOTE: This only runs against nodes that are online from a
previous deploy.

Closes: ARMBAND-47

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

docs: Spelling correction

Change-Id: I35076b8cd81451482944d91f3dd3337dd849ef28
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
(cherry picked from commit 4c0e4186721a2315ac316f5170c6cd3a8199eb6a)

Merge "patches: pharos: Dynamic PXE interface index" into stable/euphrates

Merge "lib.sh: Fix compatibility with bash 4.2" into stable/euphrates

patches: pharos: Dynamic PXE interface index

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

patches: pharos: IPMI: Trim netmask from IP

ericsson-pod1 uses 'IP/netmask' format for IPMI IPs in its PDF, which
is part of PDF spec, so update our installer adapter template
accordingly.

This change will be reverted once the patch is merged upstream in
Pharos OPNFV git repo.

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

ci/deploy.sh: Add PDF parsing dependencies

The following packages are required for PDF parsing:
- python
- python-ipaddress
- python-jinja2

Note that `python-ipaddress` is not available on older Ubuntu
distributions (e.g. Trusty), in which case `pip` should be used to
install it. An alternative would be to use python3 packages.

Update the installation instructions to specify minimum expected
requirements on the jump server.

JIRA: FUEL-292

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

Merge "AArch64: Switch jumpserver VMs to virtio video" into stable/euphrates

lib.sh: Fix compatibility with bash 4.2

JIRA: FUEL-296

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

Merge "docs: Add more info about virtual deployment" into stable/euphrates

Add missing installation dependency

- uuidgen is required for installation
- Add installation package for both Debian and
  RHEL based linux distribitions

Change-Id: I9c9bf04e64dc6be1b4e8fb92aea531eccbea33a5
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
(cherry picked from commit 95835f48cc4a65e5ccc1c48c94fa4caa51e67733)

docs: Add more info about virtual deployment

Change-Id: I82f639f380092ea6800ed1e7c86a415b7979ec44
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
(cherry picked from commit e942d5b7b4d73f2030840c08cb2943f7599eb557)

AArch64: Switch jumpserver VMs to virtio video

Drop vgabios dependency by switching video from VGA to virtio for
all VMs spawned on the jumpserver.

NOTE: This requires virtualization packages on the jumpserver to be
up to date (e.g. libvirt, QEMU).

JIRA: ARMBAND-306

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

Run aodh state one by one

Apply aodh state in consecutive order to avoid
a race condition with database synchronization.

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