fuel.git
6 years agoPDF: reclass: Rename template file suffix to _pdf 27/48027/2
Alexandru Avadanii [Wed, 29 Nov 2017 03:47:48 +0000 (04:47 +0100)]
PDF: reclass: Rename template file suffix to _pdf

Init is a generic suffix which also collides with pre-existing files.
A distinct suffix (e.g. _pdf) should be used.

JIRA: FUEL-310

Change-Id: I919a5394e7ff432ee86d10bafe889aeadb181649
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agostates: Rename openstack, add baremetal_init 17/48317/1
Alexandru Avadanii [Fri, 1 Dec 2017 02:03:52 +0000 (03:03 +0100)]
states: Rename openstack, add baremetal_init

To align with new cluster naming convention, rename 'openstack'
state file to 'openstack_noha'.
While at it, factor out baremetal setup from 'virtual_control_plane'
into a new state that will be reused in upcoming scenarios, remove
useless sync_all (automatically done after node reboot).

FUEL-310

Change-Id: I6d7e5db8f09305f2fd8eeca0199a2e85b08d2202
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agobaremetal: openstack_proxy: Rename iface dicts 15/48315/1
Alexandru Avadanii [Sun, 3 Dec 2017 18:44:32 +0000 (19:44 +0100)]
baremetal: openstack_proxy: Rename iface dicts

Later we will want to merge multiple openstack_* classes, which would
try to merge the 'single', 'dhcp' interface definitions and fail due
to mismstached types (proxy has 'dict' types while the rest do not).
Let's rename the proxy iface definitions to prevent that.

JIRA: FUEL-310

Change-Id: I1be18ddbbeae1bb3ee6de9bd783ee57b185cd477
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agobaremetal: Use common database_init, control_init 13/48313/1
Alexandru Avadanii [Sun, 3 Dec 2017 01:58:11 +0000 (02:58 +0100)]
baremetal: Use common database_init, control_init

While at it, delete unused haproxy_openstack_api.

JIRA: FUEL-310

Change-Id: I01953b01624fe3e9da8074239d20056f3762efc7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoRename reclass models to add "-ha" or "-noha" 81/47981/4
Alexandru Avadanii [Tue, 28 Nov 2017 19:27:05 +0000 (20:27 +0100)]
Rename reclass models to add "-ha" or "-noha"

Parse all reclass j2 templates, not only common + current scenario
(useful when adding new scenarios later).

JIRA: FUEL-310

Change-Id: I8e87af702f83c42cb8f766bf6f121449aa5f2c26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "[virtual] Update dpdk scenario with pike"
Michael Polenchuk [Mon, 4 Dec 2017 09:46:19 +0000 (09:46 +0000)]
Merge "[virtual] Update dpdk scenario with pike"

6 years ago[virtual] Update dpdk scenario with pike 57/48157/1
Michael Polenchuk [Fri, 1 Dec 2017 08:49:19 +0000 (12:49 +0400)]
[virtual] Update dpdk scenario with pike

Change-Id: I879f565fe17539a54770fa22a6088c6493524e0c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agosalt.sh: Force ocata link creation 41/48141/1
Alexandru Avadanii [Fri, 1 Dec 2017 00:42:22 +0000 (01:42 +0100)]
salt.sh: Force ocata link creation

Required for re-deploying with `ci/deploy.sh -f`.

Change-Id: I8e6d95f17f57b9dab3257fb4c8ccd1f962dacb45
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "AArch64: base image: pre-install salt-minion"
Michael Polenchuk [Wed, 29 Nov 2017 08:49:22 +0000 (08:49 +0000)]
Merge "AArch64: base image: pre-install salt-minion"

6 years ago[baremetal] Fix prx stale route via MaaS DHCP 63/47963/1
Alexandru Avadanii [Tue, 28 Nov 2017 18:53:50 +0000 (19:53 +0100)]
[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>
6 years agoRevert "[baremetal] Fix maas_subnets without maas_fabrics" 25/47925/3
Michael Polenchuk [Tue, 28 Nov 2017 11:57:03 +0000 (11:57 +0000)]
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>
6 years ago[virtual] Update openstack version to pike 07/47507/8
Michael Polenchuk [Mon, 20 Nov 2017 11:50:53 +0000 (15:50 +0400)]
[virtual] Update openstack version to pike

Change-Id: I1df0228cb44bf9122aaf93dd25fc16a0d26a5240
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agoMerge "Add pre-{install,purge} support for base image"
Michael Polenchuk [Tue, 28 Nov 2017 08:26:49 +0000 (08:26 +0000)]
Merge "Add pre-{install,purge} support for base image"

6 years ago[baremetal] VCP VM base img: Switch URL to AWS S3 71/47871/1
Alexandru Avadanii [Mon, 27 Nov 2017 19:19:11 +0000 (20:19 +0100)]
[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>
6 years agoAArch64: base image: pre-install salt-minion 59/47859/1
Alexandru Avadanii [Mon, 27 Nov 2017 00:29:32 +0000 (01:29 +0100)]
AArch64: base image: pre-install salt-minion

While at it, rename apt repo in foundation node user-data template
from "salt" to "saltstack", to align with reclass model naming.

Change-Id: I5b216492349ae187b568884b1ab4046c52b1c6b2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoAdd pre-{install,purge} support for base image 05/47805/5
Alexandru Avadanii [Fri, 24 Nov 2017 19:28:01 +0000 (20:28 +0100)]
Add pre-{install,purge} support for base image

Extend <lib.sh> and its invocation from <ci.deploy.sh> with
support for modifying foundation node VMs base image prior to
using it with:
- additional APT GPG keys;
- additional APT repos;
- packages to pre-install;
- packages to pre-remove;
- (non-configurable) cloud init datasource via NoCloud only,
  so VCP VMs won't wait for metadata service;

While at it, re-use the resulting image as a base for another
round of pre-patching (same operations as above are supported)
to provide a base image for VCP VMs.

Add AArch64-specific configuration based on new mechanisms:
- pre-install linux-image-generic-hwe-16.04-edge (and headers)
  for foundation node and VCP (common) image (also requires new
  repo and its key);
- pre-install cloud-init for VCP image (it should already be
  installed, but script needs non-empty config for VCP to create
  the VCP image and transfer it over to Salt Master);

NOTE: cloud-init is required on VCP VMs for DHCP on 1st iface.

JIRA: FUEL-309

Change-Id: I7dcaf0ffd9c57009133c6d339496ec831ab14375
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoAlign options of glusterfs nova_instances volume 39/47839/2
Michael Polenchuk [Mon, 27 Nov 2017 10:06:08 +0000 (14:06 +0400)]
Align options of glusterfs nova_instances volume

Change-Id: If0558afd37f16678290353fa9c5e6c4163f814a0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agoMerge "[baremetal] MaaS: Fix adding mcp.rsa.pub"
Michael Polenchuk [Mon, 27 Nov 2017 07:54:17 +0000 (07:54 +0000)]
Merge "[baremetal] MaaS: Fix adding mcp.rsa.pub"

6 years agoMerge "[baremetal] Retry cinder.controller on failure"
Michael Polenchuk [Mon, 27 Nov 2017 07:52:23 +0000 (07:52 +0000)]
Merge "[baremetal] Retry cinder.controller on failure"

6 years agoMerge "Revert "Apply apache state on proxy nodes""
Michael Polenchuk [Mon, 27 Nov 2017 07:47:17 +0000 (07:47 +0000)]
Merge "Revert "Apply apache state on proxy nodes""

6 years ago[baremetal] MaaS: Fix adding mcp.rsa.pub 13/47813/1
Alexandru Avadanii [Sun, 26 Nov 2017 23:11:28 +0000 (00:11 +0100)]
[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>
6 years ago[baremetal] Retry cinder.controller on failure 11/47811/1
Alexandru Avadanii [Sun, 26 Nov 2017 22:55:45 +0000 (23:55 +0100)]
[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>
6 years agoBring in newer glusterfs for mtime unsplit brain 01/47801/1
Alexandru Avadanii [Sat, 25 Nov 2017 16:41:20 +0000 (17:41 +0100)]
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>
6 years agoRevert "Apply apache state on proxy nodes" 79/47779/1
Alexandru Avadanii [Fri, 24 Nov 2017 18:35:01 +0000 (19:35 +0100)]
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

6 years agoMerge "[docs] Add MCP user guide"
Alexandru Avadanii [Fri, 24 Nov 2017 15:35:05 +0000 (15:35 +0000)]
Merge "[docs] Add MCP user guide"

6 years agoMerge "docs: Update prx nodes on network diagrams"
Alexandru Avadanii [Fri, 24 Nov 2017 15:29:26 +0000 (15:29 +0000)]
Merge "docs: Update prx nodes on network diagrams"

6 years ago[docs] Add MCP user guide 19/47719/2
Cristina Pauna [Thu, 23 Nov 2017 15:36:29 +0000 (17:36 +0200)]
[docs] Add MCP user guide

Change-Id: I97a5a2817004850abc3f702004819a907472faf7
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
6 years agodocs: Update prx nodes on network diagrams 61/47761/2
Guillermo Herrero [Fri, 24 Nov 2017 11:38:59 +0000 (12:38 +0100)]
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>
6 years agoSwitch nofeature-ha compute nodes to UCA repo 51/47751/1
Michael Polenchuk [Fri, 24 Nov 2017 08:10:08 +0000 (12:10 +0400)]
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>
6 years agosalt.sh: Rework `git -C` for older git compat 17/47717/1
Alexandru Avadanii [Thu, 23 Nov 2017 14:41:39 +0000 (15:41 +0100)]
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>
6 years ago[baremetal] Fix maas_subnets without maas_fabrics 79/47679/1
Alexandru Avadanii [Thu, 23 Nov 2017 01:31:28 +0000 (02:31 +0100)]
[baremetal] Fix maas_subnets without maas_fabrics

Change-Id: I603b39d46d3f2f2448b8f9746ad0745e416bbee7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "ci/deploy.sh: Add new `-E` arg for env erase"
Alexandru Avadanii [Wed, 22 Nov 2017 14:57:27 +0000 (14:57 +0000)]
Merge "ci/deploy.sh: Add new `-E` arg for env erase"

6 years ago[virtual] Apply nova controller state twice 59/47659/1
Michael Polenchuk [Wed, 22 Nov 2017 11:38:05 +0000 (15:38 +0400)]
[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>
6 years agoci/deploy.sh: Add new `-E` arg for env erase 61/47461/11
Alexandru Avadanii [Sat, 18 Nov 2017 19:46:05 +0000 (20:46 +0100)]
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>
7 years agoMerge "[baremetal] public gateway setup on prx nodes"
Michael Polenchuk [Tue, 21 Nov 2017 08:04:04 +0000 (08:04 +0000)]
Merge "[baremetal] public gateway setup on prx nodes"

7 years ago[baremetal] public gateway setup on prx nodes 41/47341/7
Guillermo Herrero [Thu, 16 Nov 2017 13:05:42 +0000 (14:05 +0100)]
[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>
7 years agopatches: linux.storage.lvm: Disable filter 57/47457/1
Alexandru Avadanii [Sat, 18 Nov 2017 19:34:46 +0000 (20:34 +0100)]
patches: linux.storage.lvm: Disable filter

JIRA: FUEL-304

Change-Id: I52ae89f933f976b678b27f79e2ad67c3699ef8ec
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "[baremetal] MaaS: Remove curtin netconfig via Salt"
Alexandru Avadanii [Fri, 17 Nov 2017 12:20:24 +0000 (12:20 +0000)]
Merge "[baremetal] MaaS: Remove curtin netconfig via Salt"

7 years agoMerge "[baremetal] Retry keystone.client state on failure"
Alexandru Avadanii [Thu, 16 Nov 2017 16:45:06 +0000 (16:45 +0000)]
Merge "[baremetal] Retry keystone.client state on failure"

7 years agoMerge "Update opendaylight/neutron patch"
Michael Polenchuk [Thu, 16 Nov 2017 07:20:06 +0000 (07:20 +0000)]
Merge "Update opendaylight/neutron patch"

7 years agoMerge "[baremetal] Re-assign mgmt network to proxy nodes"
Michael Polenchuk [Thu, 16 Nov 2017 06:51:50 +0000 (06:51 +0000)]
Merge "[baremetal] Re-assign mgmt network to proxy nodes"

7 years ago[baremetal] Retry keystone.client state on failure 69/47269/2
Alexandru Avadanii [Wed, 15 Nov 2017 16:46:24 +0000 (17:46 +0100)]
[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>
7 years agoMerge "Enable neutron trunk ports"
Alexandru Avadanii [Wed, 15 Nov 2017 16:50:12 +0000 (16:50 +0000)]
Merge "Enable neutron trunk ports"

7 years agoEnable neutron trunk ports 89/47189/2
Michael Polenchuk [Tue, 14 Nov 2017 14:19:33 +0000 (18:19 +0400)]
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>
7 years agoUpdate opendaylight/neutron patch 83/47183/3
Michael Polenchuk [Tue, 14 Nov 2017 12:33:16 +0000 (16:33 +0400)]
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>
7 years ago[baremetal] Re-assign mgmt network to proxy nodes 49/47149/2
Alexandru Avadanii [Mon, 13 Nov 2017 20:12:30 +0000 (21:12 +0100)]
[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>
7 years ago[baremetal] SaltStack Deployment Documentation 37/47137/2
Alexandru Avadanii [Mon, 13 Nov 2017 19:13:43 +0000 (20:13 +0100)]
[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>
7 years ago[baremetal] MaaS: Remove curtin netconfig via Salt 65/46865/3
Alexandru Avadanii [Wed, 8 Nov 2017 14:16:34 +0000 (15:16 +0100)]
[baremetal] MaaS: Remove curtin netconfig via Salt

JIRA: FUEL-301

Change-Id: Id6b2b423b8045c581fa5c02133cf91702d9915c9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "AArch64: deploy.sh: Add AAVMF install prereq"
Alexandru Avadanii [Mon, 13 Nov 2017 16:04:55 +0000 (16:04 +0000)]
Merge "AArch64: deploy.sh: Add AAVMF install prereq"

7 years agoMerge "docs: Add details to the installation instruction"
Alexandru Avadanii [Mon, 13 Nov 2017 15:59:29 +0000 (15:59 +0000)]
Merge "docs: Add details to the installation instruction"

7 years agoMerge "deploy.sh: Check hypervisor after prereq install"
Alexandru Avadanii [Mon, 13 Nov 2017 15:39:47 +0000 (15:39 +0000)]
Merge "deploy.sh: Check hypervisor after prereq install"

7 years agodocs: Add details to the installation instruction 19/47119/2
Cristina Pauna [Mon, 13 Nov 2017 13:06:45 +0000 (15:06 +0200)]
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>
7 years ago[baremetal] prx: Fix empty Apache module list 85/47085/1
Alexandru Avadanii [Sun, 12 Nov 2017 05:45:50 +0000 (06:45 +0100)]
[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>
7 years agosalt formulas: Pin via reclass instead of salt.sh 83/47083/2
Alexandru Avadanii [Sun, 12 Nov 2017 01:05:50 +0000 (02:05 +0100)]
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>
7 years agosalt.sh: Pin MaaS formula to last known stable ver 79/47079/1
Alexandru Avadanii [Sat, 11 Nov 2017 18:07:48 +0000 (19:07 +0100)]
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>
7 years agoAArch64: deploy.sh: Add AAVMF install prereq 53/47053/1
Alexandru Avadanii [Fri, 10 Nov 2017 18:05:48 +0000 (19:05 +0100)]
AArch64: deploy.sh: Add AAVMF install prereq

Change-Id: I7b3bb3eac1b4665dc9c08eaf6f5af336cde31f87
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agodeploy.sh: Check hypervisor after prereq install 49/47049/3
Alexandru Avadanii [Fri, 10 Nov 2017 17:01:53 +0000 (18:01 +0100)]
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>
7 years agoApply apache state on proxy nodes 33/47033/2
Michael Polenchuk [Fri, 10 Nov 2017 12:58:06 +0000 (16:58 +0400)]
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>
7 years agoMerge "[baremetal] package: install python-yaml"
Michael Polenchuk [Fri, 10 Nov 2017 09:42:27 +0000 (09:42 +0000)]
Merge "[baremetal] package: install python-yaml"

7 years agoMerge "docs: add Pod Descriptor Files information"
Alexandru Avadanii [Thu, 9 Nov 2017 18:15:10 +0000 (18:15 +0000)]
Merge "docs: add Pod Descriptor Files information"

7 years ago[baremetal] package: install python-yaml 41/46941/2
Taseer Ahmed [Thu, 9 Nov 2017 13:51:23 +0000 (18:51 +0500)]
[baremetal] package: install python-yaml

- Required for PDF parsing

Change-Id: I95205e62efab3e9920687866d3a53a135828a218
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
7 years agoHandle vlan package to avoid downgrade 23/46923/2
Michael Polenchuk [Thu, 9 Nov 2017 08:11:06 +0000 (12:11 +0400)]
Handle vlan package to avoid downgrade

Change-Id: Ic81507f3f7b3fec593b507e0c534434e8489b01b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agodocs: add Pod Descriptor Files information 33/46933/2
Guillermo Herrero [Thu, 9 Nov 2017 10:57:40 +0000 (11:57 +0100)]
docs: add Pod Descriptor Files information

Change-Id: I9ca83d2bc42cb15cd37aa3726c02c458fb8a0ea3
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
7 years agoMerge "lib.sh: Cleanup previous /boot/efi contents"
Alexandru Avadanii [Wed, 8 Nov 2017 11:42:02 +0000 (11:42 +0000)]
Merge "lib.sh: Cleanup previous /boot/efi contents"

7 years agolib.sh: Cleanup previous /boot/efi contents 23/46823/1
Alexandru Avadanii [Wed, 8 Nov 2017 01:09:13 +0000 (02:09 +0100)]
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>
7 years agoMaaS: Fix conflicting curtin network config 11/46811/1
Alexandru Avadanii [Tue, 7 Nov 2017 19:02:28 +0000 (20:02 +0100)]
MaaS: Fix conflicting curtin network config

JIRA: FUEL-301

Change-Id: I9de98fb961fd1d480b45a774de61ad6a93e9addf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "docs: Add network layout example diagrams"
Alexandru Avadanii [Tue, 7 Nov 2017 15:35:45 +0000 (15:35 +0000)]
Merge "docs: Add network layout example diagrams"

7 years agoMerge "[maas] Conform regex to machines status output"
Alexandru Avadanii [Tue, 7 Nov 2017 15:31:25 +0000 (15:31 +0000)]
Merge "[maas] Conform regex to machines status output"

7 years ago[maas] Conform regex to machines status output 83/46783/2
Michael Polenchuk [Tue, 7 Nov 2017 10:12:19 +0000 (14:12 +0400)]
[maas] Conform regex to machines status output

Change-Id: Icc30d27951abb1e231c9269c6293782a39e08fb6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoRevert "Freeze the galera formula to avoid update" 77/46777/2
Michael Polenchuk [Tue, 7 Nov 2017 07:57:22 +0000 (07:57 +0000)]
Revert "Freeze the galera formula to avoid update"

This reverts commit f49340e1aac3f5e8bb009a9d0d35aa6fedba7384.
Version has been set back to 5.6 in upstream.

Change-Id: I06d6865e59cfbc5055322eb31cbb237075ebdcb1
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoMerge "Enable glance v1 api for orchestra tests"
Alexandru Avadanii [Fri, 3 Nov 2017 17:16:14 +0000 (17:16 +0000)]
Merge "Enable glance v1 api for orchestra tests"

7 years agosalt modules: debian_ip: Accept uppercase ifaces 85/46585/2
Alexandru Avadanii [Thu, 2 Nov 2017 18:36:23 +0000 (19:36 +0100)]
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>
7 years agoEnable glance v1 api for orchestra tests 59/46659/1
Michael Polenchuk [Fri, 3 Nov 2017 10:59:20 +0000 (14:59 +0400)]
Enable glance v1 api for orchestra tests

Change-Id: Ia896c3f9fcd96dd498eef6d1f83d46e29df0cd6b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoFreeze the galera formula to avoid update 77/46477/3
Michael Polenchuk [Tue, 31 Oct 2017 13:29:48 +0000 (17:29 +0400)]
Freeze the galera formula to avoid update

Change-Id: Ibf03a7dc2ed58a749476ae0bdc6cad2bba8783fb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years agoConnect proxy nodes to public network 05/46205/3
Michael Polenchuk [Wed, 25 Oct 2017 13:43:49 +0000 (17:43 +0400)]
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>
7 years ago[virtual] Horizon: server: secure = False 37/46437/3
Alexandru Avadanii [Mon, 30 Oct 2017 17:40:11 +0000 (18:40 +0100)]
[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>
7 years agodocs: Add network layout example diagrams 99/46399/8
Alexandru Avadanii [Sun, 29 Oct 2017 20:25:11 +0000 (21:25 +0100)]
docs: Add network layout example diagrams

JIRA: FUEL-295

Change-Id: I3d7958951f1b37fe34dfaa28710a7f286a7a549a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoMerge "lib.sh: rm Ubuntu boot entry on EFI systems"
Alexandru Avadanii [Mon, 30 Oct 2017 17:16:07 +0000 (17:16 +0000)]
Merge "lib.sh: rm Ubuntu boot entry on EFI systems"

7 years agodocs: Spelling correction 73/46373/1
Taseer Ahmed [Sun, 29 Oct 2017 10:57:46 +0000 (15:57 +0500)]
docs: Spelling correction

Change-Id: I35076b8cd81451482944d91f3dd3337dd849ef28
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
7 years agolib.sh: rm Ubuntu boot entry on EFI systems 69/46369/1
Alexandru Avadanii [Thu, 24 Aug 2017 02:09:59 +0000 (04:09 +0200)]
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>
7 years agopatches: pharos: Dynamic PXE interface index 37/46337/1
Alexandru Avadanii [Fri, 27 Oct 2017 19:04:10 +0000 (21:04 +0200)]
patches: pharos: Dynamic PXE interface index

Change-Id: I7eae35c2e040cf316af45fd420ba6611abb2fa4b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agopatches: pharos: IPMI: Trim netmask from IP 27/46327/1
Alexandru Avadanii [Fri, 27 Oct 2017 17:21:40 +0000 (19:21 +0200)]
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>
7 years agoMerge "ci/deploy.sh: Add PDF parsing dependencies"
Alexandru Avadanii [Fri, 27 Oct 2017 10:19:04 +0000 (10:19 +0000)]
Merge "ci/deploy.sh: Add PDF parsing dependencies"

7 years agoMerge "lib.sh: Fix compatibility with bash 4.2"
Alexandru Avadanii [Fri, 27 Oct 2017 10:06:33 +0000 (10:06 +0000)]
Merge "lib.sh: Fix compatibility with bash 4.2"

7 years agoci/deploy.sh: Add PDF parsing dependencies 63/46263/4
Alexandru Avadanii [Thu, 26 Oct 2017 16:53:53 +0000 (18:53 +0200)]
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>
7 years agoMerge "AArch64: Switch jumpserver VMs to virtio video"
Alexandru Avadanii [Fri, 27 Oct 2017 09:26:38 +0000 (09:26 +0000)]
Merge "AArch64: Switch jumpserver VMs to virtio video"

7 years agoMerge "Add missing installation dependency"
Michael Polenchuk [Fri, 27 Oct 2017 06:37:32 +0000 (06:37 +0000)]
Merge "Add missing installation dependency"

7 years agoMerge "docs: Add more info about virtual deployment"
Michael Polenchuk [Fri, 27 Oct 2017 06:36:46 +0000 (06:36 +0000)]
Merge "docs: Add more info about virtual deployment"

7 years agolib.sh: Fix compatibility with bash 4.2 75/46275/1
Alexandru Avadanii [Thu, 26 Oct 2017 18:54:41 +0000 (20:54 +0200)]
lib.sh: Fix compatibility with bash 4.2

JIRA: FUEL-296

Change-Id: Ide9f9333fe9b44ff6b78678064f8e67f05aabd42
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agoAArch64: Switch jumpserver VMs to virtio video 65/46265/1
Alexandru Avadanii [Thu, 26 Oct 2017 17:22:19 +0000 (19:22 +0200)]
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>
7 years agoAdd missing installation dependency 43/46243/2
Taseer Ahmed [Thu, 26 Oct 2017 07:25:25 +0000 (12:25 +0500)]
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>
7 years agodocs: Add more info about virtual deployment 41/46241/4
Taseer Ahmed [Thu, 26 Oct 2017 07:19:34 +0000 (12:19 +0500)]
docs: Add more info about virtual deployment

Change-Id: I82f639f380092ea6800ed1e7c86a415b7979ec44
Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
7 years agoRun aodh state one by one 45/46245/1
Michael Polenchuk [Thu, 26 Oct 2017 08:46:58 +0000 (12:46 +0400)]
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>
7 years agofix for documentation: correct git checkout tag is opnfv-5.0.2 79/46179/1
Mika Rautakumpu [Tue, 24 Oct 2017 15:39:50 +0000 (18:39 +0300)]
fix for documentation: correct git checkout tag is opnfv-5.0.2

Change-Id: I2c4192d4dc299d167ba6b1b9db91c6d73c87c417
Signed-off-by: Mika Rautakumpu <mika.rautakumpu@nokia.com>
7 years agoMinor updates to documentation 29/46129/2
Cristina Pauna [Mon, 23 Oct 2017 15:26:42 +0000 (18:26 +0300)]
Minor updates to documentation

Change-Id: I35b8069a0239858dad3b446f683d64140964fb42
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
7 years agoCatch expected failures 97/46097/1
Michael Polenchuk [Sat, 21 Oct 2017 17:27:18 +0000 (21:27 +0400)]
Catch expected failures

* neutron on computes (dpdk case: void state)
* mongodb server (incomplete initialization)

Change-Id: I3dd3266b5c2d1b155981f725e15742cd38ed899d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[vcp] Increase timeout till VCP VMs online 01/45901/1
Alexandru Avadanii [Thu, 19 Oct 2017 22:32:49 +0000 (00:32 +0200)]
[vcp] Increase timeout till VCP VMs online

Change-Id: I95c284cbf374194694360bffbeaf6770db6111bf
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years agolib.sh: Fix locals override in nested invocations 93/45893/1
Alexandru Avadanii [Thu, 19 Oct 2017 21:58:05 +0000 (23:58 +0200)]
lib.sh: Fix locals override in nested invocations

'wait_for' bash function is nested in another 'wait_for' call in some
places, which leads to inner calls interfering with outer calls by
overriding the locally scoped variables, including the 'attempt'
internal counter. In some cases, the outer 'wait_for' would exit
after a single attempt.

Fix that by running all contents of `wait_for` inside a subshell,
which inherits outer calls variables, but does not override them
when the inner call is finished.

Change-Id: I450eda3d023af2380c61ee930071fbfc393a5645
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 years ago[virtual] Rise memory for ovs/dpdk scenario 47/45847/1
Michael Polenchuk [Thu, 19 Oct 2017 16:13:11 +0000 (20:13 +0400)]
[virtual] Rise memory for ovs/dpdk scenario

Let's add more hugepages/memory to the compute nodes since
snaps_smoke required 2Gb flavor for tests.

Change-Id: If52f30d53a6469abeca67aaf2bdee551542d1653
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
7 years ago[baremetal] Remove infinite loops from node checks 27/45827/1
Alexandru Avadanii [Thu, 19 Oct 2017 14:46:28 +0000 (16:46 +0200)]
[baremetal] Remove infinite loops from node checks

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