fuel.git
6 years agoMerge "[baremetal] Upgrade packages on kvm, cmp nodes too"
Michael Polenchuk [Thu, 14 Dec 2017 08:07:30 +0000 (08:07 +0000)]
Merge "[baremetal] Upgrade packages on kvm, cmp nodes too"

6 years agoRevert "Horizon: service: Default to v2 API" 81/48881/1
Alexandru Avadanii [Thu, 14 Dec 2017 02:05:20 +0000 (03:05 +0100)]
Revert "Horizon: service: Default to v2 API"

Pike Horizon packages contain the fix for full v3 compatibility.
Also update the reclass models to use v3 API.

JIRA: FUEL-284

This reverts commit 68ff467c4c2d9d0f201e2912c97616402f8109a3.

Change-Id: I7795197100a67f892889eefce73252ec90d289cc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years ago[baremetal] Upgrade packages on kvm, cmp nodes too 75/48875/1
Alexandru Avadanii [Thu, 14 Dec 2017 01:33:28 +0000 (02:33 +0100)]
[baremetal] Upgrade packages on kvm, cmp nodes too

MaaS installs a few packages via curtin, which don't get upgraded
later, even if we add extra repos (it will be the case for novcp).
Perform a package upgrade on all baremetal nodes, as it's also a
good security practice.

JIRA: FUEL-310

Change-Id: Ib365e42a0d2f65813fc9bef516326ec89fe407de
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agodeploy.sh: Fix missing space in dependencies list 51/48851/1
Alexandru Avadanii [Wed, 13 Dec 2017 19:59:46 +0000 (20:59 +0100)]
deploy.sh: Fix missing space in dependencies list

Change-Id: I4d41ff8b9f7c1b59a2c1a400b9335f17b8c542be
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "deploy.sh: Factor out pkg deps into yaml files"
Alexandru Avadanii [Wed, 13 Dec 2017 19:29:02 +0000 (19:29 +0000)]
Merge "deploy.sh: Factor out pkg deps into yaml files"

6 years agopatches: libvirt: Use "libvirt" unix_sock_group 47/48847/2
Alexandru Avadanii [Sun, 20 Aug 2017 16:18:53 +0000 (18:18 +0200)]
patches: libvirt: Use "libvirt" unix_sock_group

Now that libvirt 3.6 is used on kvm nodes (via UCA repos), which
by default uses "libvirt" group for socket ownership,
change old "libvirtd" in salt-formula-libvirt's:
- libvirt/files/libvirtd.conf.Debian

This allows us to remove the manual group creation from VCP state
file, which was not re-entrant (failed if group already existed).

Change-Id: Id61fecd82daec1c0716ff4796b79dce47d096c3a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years ago[baremetal] Link br-ex as ovs port 99/48799/2
Michael Polenchuk [Wed, 13 Dec 2017 12:00:29 +0000 (16:00 +0400)]
[baremetal] Link br-ex as ovs port

Add br-ex and physical public interface
as ports directly to ovs bridge.

Change-Id: I12c078d3e286af7c5fa3078cc055905c03cf600b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agoAArch64: Move to pike-armband repo 57/48757/2
Alexandru Avadanii [Tue, 12 Dec 2017 22:07:56 +0000 (23:07 +0100)]
AArch64: Move to pike-armband repo

Armband restructured its repos to support UCA-only virtual deploys,
propagate the change to our base image pre-build. Drop apt-mk repos,
should only be added later by Salt, when MCP repos are also present.

JIRA: ARMBAND-338

Change-Id: Ieafa6d3fb0599679341053187b4a7d778af86428
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agodeploy.sh: Factor out pkg deps into yaml files 51/48751/6
Alexandru Avadanii [Sat, 9 Dec 2017 17:20:16 +0000 (18:20 +0100)]
deploy.sh: Factor out pkg deps into yaml files

Instead of hardcoding the packages to install on the jumphost at
deploy time in `ci/deploy.sh`, move the requirements list to a
dedicated yaml file, so it is decoupled from actual code.

While at it, add missing deps:
- ipxe-qemu (AArch64 Ubuntu only);

Change-Id: I9ee5c0796b70f9d29427d608b6415333c8841e1e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoMerge "[baremetal] Move all MaaS PXE net config to PDF"
Alexandru Avadanii [Tue, 12 Dec 2017 15:51:22 +0000 (15:51 +0000)]
Merge "[baremetal] Move all MaaS PXE net config to PDF"

6 years agoMerge "[baremetal] Fixup pike deployment (2)"
Alexandru Avadanii [Tue, 12 Dec 2017 15:42:14 +0000 (15:42 +0000)]
Merge "[baremetal] Fixup pike deployment (2)"

6 years ago[baremetal] Fixup pike deployment (2) 01/48701/1
Michael Polenchuk [Tue, 12 Dec 2017 09:00:30 +0000 (13:00 +0400)]
[baremetal] Fixup pike deployment (2)

* align dpdk packages list
* add missing libvirtd group to vcp host nodes

Change-Id: Ideab2b16ca0561035b225e58bf3d0c5653d303bb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years ago[baremetal] Set public vlan tag on ovs port 97/48697/1
Michael Polenchuk [Tue, 12 Dec 2017 08:48:28 +0000 (12:48 +0400)]
[baremetal] Set public vlan tag on ovs port

Change-Id: Ia5a34d8d8a9649fc911198fed86aee51071ba568
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agoMerge "AArch64: s/ocata/pike/g in scenario defaults"
Alexandru Avadanii [Mon, 11 Dec 2017 19:40:11 +0000 (19:40 +0000)]
Merge "AArch64: s/ocata/pike/g in scenario defaults"

6 years agoAArch64: s/ocata/pike/g in scenario defaults 69/48669/1
Alexandru Avadanii [Mon, 11 Dec 2017 18:56:54 +0000 (19:56 +0100)]
AArch64: s/ocata/pike/g in scenario defaults

We hard set some repo URLs used for base image pre-building, so bump
those to Pike, now that Armband repos for Pike are populated.

JIRA: ARMBAND-335

Change-Id: Ibd7267b628985a3c7a33d9d8a93c824077c69f10
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years ago[baremetal] Move all MaaS PXE net config to PDF 75/48575/5
Alexandru Avadanii [Fri, 8 Dec 2017 00:20:47 +0000 (01:20 +0100)]
[baremetal] Move all MaaS PXE net config to PDF

- s/opnfv_maas_pxe_/opnfv_infra_maas_pxe_/g to align with other vars;
- patches: pharos: Add MaaS PXE network to installer adapter;
- runtime.yml{,.template}: move to installer adapter, update
  pod_config.yml example;
- drop MAAS_PXE_NETWORK global env var, now read strictly from PDF;

JIRA: FUEL-313

Change-Id: I46d7510bd53fba7890c411d36bc28fd6ff6f3648
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agopatches: pharos: Bump & drop upstream patches 65/48665/2
Alexandru Avadanii [Mon, 11 Dec 2017 18:15:15 +0000 (19:15 +0100)]
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>
6 years agoMerge "[baremetal] cleanup: Parameterize VCP hostnames"
Alexandru Avadanii [Mon, 11 Dec 2017 17:41:37 +0000 (17:41 +0000)]
Merge "[baremetal] cleanup: Parameterize VCP hostnames"

6 years agoMerge "[baremetal] Fixup pike deployment"
Alexandru Avadanii [Mon, 11 Dec 2017 17:15:05 +0000 (17:15 +0000)]
Merge "[baremetal] Fixup pike deployment"

6 years agoMerge "pod_config: cleanup: Drop infra_compute_*_address"
Alexandru Avadanii [Mon, 11 Dec 2017 17:11:48 +0000 (17:11 +0000)]
Merge "pod_config: cleanup: Drop infra_compute_*_address"

6 years ago[baremetal] cleanup: Parameterize VCP hostnames 19/48619/3
Alexandru Avadanii [Sun, 10 Dec 2017 19:24:01 +0000 (20:24 +0100)]
[baremetal] cleanup: Parameterize VCP hostnames

We already define the hostnames in a central location
(openstack_init), so use the reclass params instead of hardcodes.
Also handle hardcoded hostnames in system.haproxy.proxy.listen
and system.mongodb.server.cluster.

This will also simplify later changes for novcp scenarios.

JIRA: FUEL-310

Change-Id: I2a8b4cd1fcb61a7c63f9047123d985bb688dca0a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agoRevert "Bring in newer glusterfs for mtime unsplit brain" 53/48653/2
Michael Polenchuk [Mon, 11 Dec 2017 15:13:25 +0000 (15:13 +0000)]
Revert "Bring in newer glusterfs for mtime unsplit brain"

Since the uca/pike repo has version of 3.11
This reverts commit 8a867449217151f59766a74c6165ffc26c7f50b4.

Change-Id: I5cc0d94b4a1b53b987fab03bc20466ee3c3eb8b2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years ago[baremetal] Fixup pike deployment 59/48659/1
Michael Polenchuk [Mon, 11 Dec 2017 15:30:17 +0000 (19:30 +0400)]
[baremetal] Fixup pike deployment

* up glusterfs.client state before actual volume usage
* handle keystone server state
* specify suitable nova packages list for uca repo
  (consoleproxy vs novncproxy)
* upgrade vcp nodes to get proper cryptography
  library for keystone
* align service names for libvirt & glusterfs

Change-Id: Iaeb7d147e6d407bbeaec2d40fd81037c939c3fe0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agopod_config: cleanup: Drop infra_compute_*_address 15/48615/2
Alexandru Avadanii [Sun, 10 Dec 2017 18:37:13 +0000 (19:37 +0100)]
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>
6 years agoMerge "[baremetal] Update openstack version to pike"
Michael Polenchuk [Mon, 11 Dec 2017 09:59:24 +0000 (09:59 +0000)]
Merge "[baremetal] Update openstack version to pike"

6 years agoMerge "states: maas: Stop using maas-stable PPA"
Michael Polenchuk [Mon, 11 Dec 2017 09:23:46 +0000 (09:23 +0000)]
Merge "states: maas: Stop using maas-stable PPA"

6 years ago[baremetal] Update openstack version to pike 87/48387/2
Michael Polenchuk [Tue, 5 Dec 2017 09:40:58 +0000 (13:40 +0400)]
[baremetal] Update openstack version to pike

Change-Id: If4208e937734df72b10aad259c65a2617ff5e19c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
6 years agoMerge "[baremetal] Migrate public bridge to ovs"
Michael Polenchuk [Mon, 11 Dec 2017 08:16:58 +0000 (08:16 +0000)]
Merge "[baremetal] Migrate public bridge to ovs"

6 years agostates: maas: Stop using maas-stable PPA 13/48613/2
Alexandru Avadanii [Sat, 9 Dec 2017 20:40:22 +0000 (21:40 +0100)]
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>
6 years agosubmodule: pharos: Bump to fix run without eyaml 05/48605/2
Alexandru Avadanii [Sat, 9 Dec 2017 00:21:42 +0000 (01:21 +0100)]
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>
6 years ago[baremetal] Migrate public bridge to ovs 95/48595/1
Michael Polenchuk [Fri, 8 Dec 2017 14:06:57 +0000 (18:06 +0400)]
[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>
6 years ago[baremetal] PDF: Use net_admin for MaaS PXE net 73/48573/4
Alexandru Avadanii [Thu, 7 Dec 2017 22:24:37 +0000 (23:24 +0100)]
[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>
6 years agopatches: pharos: Drop patches merged upstream 65/48565/1
Alexandru Avadanii [Thu, 7 Dec 2017 20:02:02 +0000 (21:02 +0100)]
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>
6 years agoMerge "virtual: Add infra/init.yml for each scenario"
Alexandru Avadanii [Thu, 7 Dec 2017 14:44:39 +0000 (14:44 +0000)]
Merge "virtual: Add infra/init.yml for each scenario"

6 years agoMerge "base image: Explicitly call kpartx"
Michael Polenchuk [Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)]
Merge "base image: Explicitly call kpartx"

6 years agoMerge "PDF: reclass: Rename template file suffix to _pdf"
Michael Polenchuk [Thu, 7 Dec 2017 08:15:00 +0000 (08:15 +0000)]
Merge "PDF: reclass: Rename template file suffix to _pdf"

6 years agoMerge "lib.sh: persistent cfg01, mas01 mcpcontrol"
Michael Polenchuk [Thu, 7 Dec 2017 07:56:28 +0000 (07:56 +0000)]
Merge "lib.sh: persistent cfg01, mas01 mcpcontrol"

6 years agoClean up noifupdown support patch 79/48379/1
Michael Polenchuk [Tue, 5 Dec 2017 08:44:50 +0000 (12:44 +0400)]
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>
6 years agovirtual: Add infra/init.yml for each scenario 21/48321/1
Alexandru Avadanii [Sat, 2 Dec 2017 23:39:05 +0000 (00:39 +0100)]
virtual: Add infra/init.yml for each scenario

Align our reclass model for virtual PODs with baremetal, by adding
an infra init file for each scenario, setting up cluster_name via
scenario infra init instead of scenario init.
While at it, reduce redundancy by defining cluster_domain based on
cluster_name via common infra init.

JIRA: FUEL-310

Change-Id: I5e89c883853fa66cb1c1fc69ce5766ee136ac477
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 agobase image: Explicitly call kpartx 47/47947/1
Alexandru Avadanii [Mon, 27 Nov 2017 23:22:45 +0000 (00:22 +0100)]
base image: Explicitly call kpartx

qemu-nbd currently available in CentOS 7 does not add partition
mappings automatically for NBD devices, so add explicit `kpartx`
calls.

Change-Id: Ifa79c89b82024602b782c449dbf4de10899e03b5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
6 years agolib.sh: persistent cfg01, mas01 mcpcontrol 85/47885/1
Alexandru Avadanii [Mon, 27 Nov 2017 22:03:29 +0000 (23:03 +0100)]
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>
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>
7 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>
7 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

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

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

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

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