Michael Polenchuk [Mon, 16 Oct 2017 11:45:54 +0000 (15:45 +0400)]
Return back glusterfs client state
In order to set properly keystone fernet keys, apply glusterfs client
state before second keystone server state. Also leave out user/group
settings for glusterfs volume of nova instances as it will be set later
by nova compute packages themselves.
Change-Id: I069e37c67f08c51ed29f45cf6f92d4a00a1ac97b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
0224929b3a87d0e0ec011311c46872e6142497cf)
Alexandru Avadanii [Wed, 18 Oct 2017 16:20:15 +0000 (16:20 +0000)]
Merge "states: Break on error, retry states up to 5 times" into stable/euphrates
Alexandru Avadanii [Wed, 18 Oct 2017 16:19:36 +0000 (16:19 +0000)]
Merge "[baremetal] Fix DPDK by running linux.system first" into stable/euphrates
Alexandru Avadanii [Wed, 18 Oct 2017 15:07:49 +0000 (15:07 +0000)]
Merge "[baremetal] reclass: Fix class order for common" into stable/euphrates
Cristina Pauna [Wed, 18 Oct 2017 11:07:20 +0000 (14:07 +0300)]
Add documentation for scenarios
Added documents for feature scenarios supported by fuel.
The nofeature scenarions don't require documentation.
Change-Id: I574e42b60125b4a59c8d921fa45e4c4fbf09137f
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit
2a74900ecd451c939a34d53a529e802cc2250db9)
Alexandru Avadanii [Tue, 17 Oct 2017 19:39:20 +0000 (21:39 +0200)]
[baremetal] reclass: Fix class order for common
Inheriting classes in the wrong order led to params being silently
overriden by defaults in the system reclass classes, leaving
some mismatched values between the controller nova config and the
compute conunterpart (e.g. metadata_password had different values).
Always inherit the common class first, so scenario-specific config
is applied on top.
NOTE: {dhcp,single}_nic are not used for mas|kvm|cmp nodes, but they
are referenced in inherited classes, so keep them for now.
Change-Id: I6cb90d5c832ffc8ab731bd9e3cd38ede858dba5c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
92530f89c061b0070766e431f839feb368e2e4ac)
Alexandru Avadanii [Mon, 16 Oct 2017 19:53:47 +0000 (21:53 +0200)]
[baremetal] Fix DPDK by running linux.system first
DPDK scenario requires hugepages to be set up and enabled before
configuring OVS ports, so apply `linux.system` on compute nodes
and reboot them before attempting to run `linux.network` state.
Change-Id: I2b685361b07727a4740a3676c5f219a6443d1cf2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
64920b8bb1e95389146451598221f2c7eb97f5e3)
Alexandru Avadanii [Sun, 15 Oct 2017 22:19:57 +0000 (00:19 +0200)]
salt.sh: DEBIAN_FRONTEND=noninteractive
Change-Id: Ibb1e78563043298dffdb4b7e9091d3f582e189fc
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
882220ff185d7bcc15e6c5f75edaee454c933956)
Michael Polenchuk [Mon, 16 Oct 2017 10:24:13 +0000 (14:24 +0400)]
[ovs/dpdk] Return true on linux.network state
linux.network state is expected to be down until node reboot
to activate required hugepages therefore return true in any case.
Change-Id: I61deac12b9ac212c5f79cdcce30cda8e5d24413b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
044f49fd195526d8c00967fb9a0b6b1ab0a36c14)
Alexandru Avadanii [Sat, 14 Oct 2017 20:47:45 +0000 (22:47 +0200)]
states: Break on error, retry states up to 5 times
While applying scenario states, break on error, and retry failed
state up to 5 times. Apply the same behavior for `salt.sh`.
Add new deploy parameter, '-D', backed up by 'CI_DEBUG' env var,
which gates deploy sh scripts logging (set -x).
Also extend '-f' deploy parameter, allowing it to be specified
more than once; the first occurence will skip infra VM creation,
but still sync reclass & other config from local repo, while a
second occurence will also disable config sync.
To prevent glusterfs client state from failing due to non-existent
nova user/group, move it after nova:compute's nova state is applied.
Change-Id: I234e126e16be0e133d878957bd88fed946955de8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
23f9ef727310a8ef449372313785241df6557559)
Alexandru Avadanii [Sat, 14 Oct 2017 17:42:41 +0000 (19:42 +0200)]
Add license headers where missing
While at it, compact 'set' into bash shebang where possible and
add `make patches-copyright` target to simplify adding patch
license headers.
Change-Id: I0c841de72e5709e5eef915a52c5ec4a7fc0f7c37
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
644e5fdfa2f49b988a5150e2a4eefc12daecd845)
Alexandru Avadanii [Thu, 12 Oct 2017 00:51:17 +0000 (02:51 +0200)]
reclass: baremetal: Factor out common code
While at it, add .yamllint file (copied from releng repo).
Change-Id: I39630c0043fe2fd601510969c401e6cc9efbf69a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
a75af3d4c30af050dd15c0f875142f6328874fe4)
Alexandru Avadanii [Sat, 14 Oct 2017 17:18:51 +0000 (19:18 +0200)]
Drop infinite loops in favor of finite wait_for
While at it, fix some shellcheck warnings, and s/fgrep/grep -F/g.
Change-Id: I093b7b4c196731b1ecc0c27a4111955b2e412762
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
089585ad5370109d4c2a476b94b0017153d7713d)
Alexandru Avadanii [Fri, 8 Sep 2017 21:03:56 +0000 (23:03 +0200)]
states: Split virtual_control_plane from maas
We should eventually also support baremetal deploys without a
virtualized control plane (VCP), so decouple MaaS provisioning
from VCP provisioning.
While at it, move "wait_for" bash function from maas state to
common library file, lib.sh.
Change-Id: I32c33135655cb6aceae901a5f92b51265a8c84b4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
ebd7067904b36ae32566da63e433365948a1f973)
Alexandru Avadanii [Mon, 25 Sep 2017 23:16:54 +0000 (01:16 +0200)]
patch.sh: Exit on patch apply failure
Patches that fail to apply are silently skipped. Since retrying is
not possible, deploy moves on, making the problem hard to observe.
Change-Id: I3fe01cef6b245de53767a660b9b4fdfae0d5d0ff
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
bd0259e7bb5f045a1ba7958d79039848d062aad1)
Alexandru Avadanii [Fri, 13 Oct 2017 17:21:26 +0000 (19:21 +0200)]
ci/deploy.sh: Add installation succesful message
Change-Id: Id366854c4ccb3b835f4a54ddea924a3a2cc30c7d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
3479e81a8bfa1ae15084100f2b3872ca8f1ed752)
Alexandru Avadanii [Fri, 13 Oct 2017 11:09:46 +0000 (11:09 +0000)]
Merge "docs: Update release documentation" into stable/euphrates
Cristina Pauna [Mon, 2 Oct 2017 14:17:45 +0000 (17:17 +0300)]
docs: Update release documentation
JIRA: FUEL-276
Change-Id: I09799b2dde3c992d229864757e655c108d33608a
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit
029462bc462b1dea05920464b8d0acc77f789eef)
Cristina Pauna [Wed, 27 Sep 2017 13:54:47 +0000 (16:54 +0300)]
docs: Update installation instructions
This documentation contains the updated procedure on how to use
Fuel to deploy openstack.
JIRA: FUEL-276
Change-Id: I38dc9c57ea386a628cd363f5bcef3818739b9122
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
(cherry picked from commit
1e3b2751ce0ca7fa2b011efdc76ae69dfc106ec8)
Alexandru Avadanii [Wed, 11 Oct 2017 18:04:10 +0000 (20:04 +0200)]
reclass: Fix all remaining yamllint warning
Change-Id: I1e0e1ba291dd4d5af578d89274f3655ee784f64e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
c11eb920a3570ed22b252bbb8eecfb5231f5db1a)
Guillermo Herrero [Mon, 9 Oct 2017 11:56:08 +0000 (13:56 +0200)]
Fix parametrized nic name variables
-Fix interface order for reclass config node
-Interface types regruped on 3 sets for each cpu arch
-Foundation VM interface names
-VCP VM interface names
-Baremetal node interface names
Change-Id: I1ae522d775ee538b35b0f043914c80c3993232fc
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
c8d0c5b687f5eec9db62171fdf53053f5ffeef28)
Alexandru Avadanii [Tue, 10 Oct 2017 17:11:34 +0000 (19:11 +0200)]
yamllint: Fix recently introduced errors
Change-Id: If117588f7c43306959d29032b1d5eeb3c751dc44
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
8401f25a520843d884abb84806873baca0452ec8)
Alexandru Avadanii [Sun, 8 Oct 2017 12:26:24 +0000 (14:26 +0200)]
reclass: Revert virt.nic to hardcoded eth{0,1}
Salt's virtualization model for virt:nic:default does not use real
interface names that are present on the node, but instead it defaults
to using "ethX" notation, that name being only a convention inside
Salt internals.
Moreover, the 'salt.control.virt' reclass class (located in
/srv/salt/reclass/classes/system/salt/control) already provides a
defalt maping between "eth{0,1}" and "br{0,1}". Using anything
different than "eth{0,1}" will lead to 2 extra (broken) mappings.
Reverting the changes in "virt:nic" reclass fixes both the python
exception recently introduced, as well as the broken defaults.
Change-Id: I5c90e3d2bc181c1ad3d87af64440439e6a41fb28
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
db2144a7f6ed8586bbab39fdb5ea15b171388e85)
Guillermo Herrero [Tue, 3 Oct 2017 08:30:47 +0000 (10:30 +0200)]
Parametrized network config: nic device names
Change-Id: I94d40529261f7753ec47a0c6a8c67ecc0fb15951
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
5ab45d25c8fd3e5528c411e09b105699c745457f)
Alexandru Avadanii [Sun, 8 Oct 2017 15:13:48 +0000 (17:13 +0200)]
ci/deploy.sh: Drop unsupported options
Drop support for unsupported arguments:
- timeout;
- iso URI;
While at it, disable shell debugging during PDF parsing to prevent
sensitive information leaking via debug logs.
Change-Id: I6b40f3e3749a3e162326728e670a176c8fa3c4bb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
106883131b2fa1c765cac7e83cc4c8e294ef231f)
Michael Polenchuk [Fri, 6 Oct 2017 08:09:36 +0000 (12:09 +0400)]
Update opendaylight version to nitrogen
* use pseudo agentdb port binding controller instead of
the deprecated network topology one
* disable superfluous l2population mechanism driver
* tidy up the duplicated haproxy neutron listen opts
* straighten karaf features list
* update jetty config
Change-Id: Ifacf8de11eb56ab72df13a312151a510b280dea2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
fca7d22742df82fc6e502b17ad45ebc11c0ba89b)
Michael Polenchuk [Fri, 6 Oct 2017 09:15:48 +0000 (13:15 +0400)]
[virtual] Extend cinder volume size
Rally test of NovaServers.boot_server_attach_created_volume_and_live_migrate
requires 10Gb volume to function, so extend volume group size in order to
avoid insufficient free space error.
Change-Id: I317935d2bf736db360061e24f299c9b885154a9e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
2d95dee51177e66f5370b85115c2999925b13657)
Alexandru Avadanii [Thu, 5 Oct 2017 15:17:28 +0000 (17:17 +0200)]
log.sh: Fix sourcing of globals.sh
Fix sourcing of globals.sh from log.sh when running with a CWD
different from scripts dir.
Change-Id: I680531022d30b57f650a612493f40fdb3e073dc2
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
9ac845bdfb5c4ec7fd8c0b0ba1bc8fec867be5aa)
Alexandru Avadanii [Tue, 3 Oct 2017 17:30:12 +0000 (19:30 +0200)]
ci/deploy.sh: Move global vars to separate file
log.sh should also work as standalone script, so factor out
global variables from <ci/deploy.sh> into <mcp/scripts/globals.sh>,
which should be sourced by log.sh when required variables are not set.
Change-Id: I5a5bb85ee5835f567d6910b11c137d95e2147714
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
45b22fab76f84cdbf71a6693dc42f24edaa4334e)
Alexandru Avadanii [Sat, 16 Sep 2017 01:22:38 +0000 (03:22 +0200)]
Identify jump host bridges based on IDF / PDF nets
- minor refactor of runtime templates parsing to allow var expansion;
- parse <pod_config.yml> into shell vars, match dynamically networks
from PDF to IP addresses on bridges of current jumphost;
- keep old '-B' parameter in <ci/deploy.sh>, use it for providing
fallback values in case there's no bridge name specified via IDF
and no IP on the jumphost for one or more of the PDF networks;
- re-enable dry-run to ease testing of the above;
- add sample 'idf-pod1.yaml' to <mcp/config/labs/local>;
The new behavior will try to determine the jump host bridge names:
1. Based on IDF mapping, if available
2. Based on PDF network matching with IP addrs on jumphost;
3. Fallback to values passed via '-B';
4. Fallback to default values hardcoded in the deploy script;
Later, we will drop MaaS network env vars in favor of PDF vars,
once the PDF template is generating them.
Change-Id: If9cd65d310c02965b2e2bfa06a0d7e0f97f1dd48
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
8ec927497b7ee0fd3b7346e957878173b080ef6a)
Michael Polenchuk [Wed, 4 Oct 2017 08:38:58 +0000 (12:38 +0400)]
[ovs/dpdk] Add missing rootwrap sudoers policy
Append required sudoers rule since uca package version
of neutron has no policy for neutron-rootwrap-daemon.
Change-Id: Id8ea5b1b6aadb9eca879d72ce4d158a7bc01060e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
a05f8d2682f2449d7d10e52038c56a0af6357def)
Alexandru Avadanii [Tue, 3 Oct 2017 23:35:01 +0000 (23:35 +0000)]
Merge "Enable options for customizing deploy workflow" into stable/euphrates
Yujun Zhang [Thu, 14 Sep 2017 15:29:50 +0000 (23:29 +0800)]
Enable options for customizing deploy workflow
Change-Id: I1011734895771fdaf653c59348a9ce0aeeff47a7
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
(cherry picked from commit
a10b7711ab3d400830406a2c425acb3431b4a5c1)
Michael Polenchuk [Tue, 3 Oct 2017 09:41:37 +0000 (13:41 +0400)]
Apply neutron formula patch after formula update
Change-Id: I8dba3676adc8cc49731d91db7cc028a9c5b1627d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
952b5cc60febe14df428f92280448327572d5c24)
Alexandru Avadanii [Mon, 2 Oct 2017 22:59:51 +0000 (00:59 +0200)]
salt.sh: Stick to older salt-formula-neutron
Recent changes to salt-formula-neutron, more precisely [1], broke the
compatibility with our current reclass model [2], which was not
updated to reflect the formula change.
Instead of locally patching the reclass model, install the latest
compatible version of the Neutron formula:
- 2016.12.1+
201709251458.
f0607d9-1xenial1;
[1] https://github.com/salt-formulas/salt-formula-neutron/commit/
79ffa26858d682f404984175dc1ab93863a149ad
[2] https://github.com/Mirantis/reclass-system-salt-model
Change-Id: Ia1bc9de9a1543f7888688be76ff3513e6b4f062b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
f2b1d6cfe31a451b0608b9a2aadead2dcf4cfabb)
Michael Polenchuk [Mon, 2 Oct 2017 18:04:20 +0000 (22:04 +0400)]
Align salt version & repos
Change-Id: If7cb8473f5c290d1d5f22fce5567f7b8da24fd9f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
0c00f813d709fd1b65e5dd52abcf16fd81b3d0e1)
Michael Polenchuk [Mon, 2 Oct 2017 08:51:44 +0000 (12:51 +0400)]
[virtual] Reset mtu for compute management bridge
Use default mtu for br-mgmt in order to resolve the live
migration failure (cannot recv data: connection timed out)
Change-Id: I9cee453d87f849e29fc877fff237f8e604f2df53
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
b45f3e15ac5581c1e8c44d0a7a1424a1d092834e)
Alexandru Avadanii [Wed, 27 Sep 2017 20:15:22 +0000 (22:15 +0200)]
pharos git submodule: Bump for latest PDF adapter
Change-Id: I658c1dfeb369adf74038abd0ce1b593d40303527
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
5ad2e311bbc1326493386aeee4d87a9091337adf)
Alexandru Avadanii [Fri, 29 Sep 2017 14:16:57 +0000 (14:16 +0000)]
Merge "lib.sh: Use host bridge in favor of virsh network" into stable/euphrates
Alexandru Avadanii [Fri, 29 Sep 2017 14:16:35 +0000 (14:16 +0000)]
Merge "PDF parsing support" into stable/euphrates
Alexandru Avadanii [Wed, 27 Sep 2017 23:40:47 +0000 (01:40 +0200)]
MaaS: Fix missing service.maas.cluster.single inc
Upstream change [1] made the inclusion of service.maas.cluster.single
mandatory by using some default reclass definitions which we don't
override explicitly.
[1] https://github.com/salt-formulas/salt-formula-maas/commit/
ce118a238bae4bcf19d2f10bca591a40405f7c3c
Change-Id: I5746b6906b341a7257e0cd2b4b0bed8ea25840f4
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
4b2dfa552656def5f56a48229705e79c5c7bcfca)
Alexandru Avadanii [Sat, 16 Sep 2017 19:13:11 +0000 (21:13 +0200)]
PDF parsing support
- add new git submodule pointing to OPNFV Pharos;
- use Pharos 'generate_config.sh' to parse the PDF using the Fuel
installer adapter and generate <pod_config.yml> dynamically;
- build <pod_config.yml> outside current git repo and sync separately
to prevent sensitive data leak;
- add <pod1.yaml> PDF sample based on LF-POD2, should be used with
'ci/deploy.sh -l local -p pod1';
Change-Id: I4e1b95f180bcd5ade5d86f516628eb8edbe64b1c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
36e4b9754dedef27637c09b510829f686bd469e4)
Alexandru Avadanii [Wed, 27 Sep 2017 19:01:20 +0000 (19:01 +0000)]
Merge "Change vlan tag of lf-pod private network" into stable/euphrates
Alexandru Avadanii [Wed, 27 Sep 2017 12:47:38 +0000 (12:47 +0000)]
Merge "Extended PDF support to all baremetal scenarios" into stable/euphrates
Alexandru Avadanii [Tue, 26 Sep 2017 18:52:36 +0000 (20:52 +0200)]
lib.sh: Use host bridge in favor of virsh network
If a linux bridge already exists on the jump host, with the same
name as the value passed via `-B` or the default, use it instead
of trying to create a virsh network.
Change-Id: If7f0753ec366d429ff101c2b37dd68f895903404
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
96cccf2b507949978c1b37c65961a5182ffbbbfd)
Michael Polenchuk [Tue, 26 Sep 2017 06:05:36 +0000 (10:05 +0400)]
Change vlan tag of lf-pod private network
Change-Id: I66f5b4ac4ab58d3dbc983b0e1bed359a58602dba
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
0e8c582713d70e00975e9a002898bc5cce66eee4)
Michael Polenchuk [Tue, 26 Sep 2017 09:21:23 +0000 (13:21 +0400)]
[virtual] Switch compute nodes to uca repo
Test of snaps_health_check gets console output of instance, which is
empty (https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/
1667033),
therefore take affected packages of computes from UCA repo.
Change-Id: I4e13a40dd47caf305efd9f393b3c3cf5a17ef312
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
c76d5e92d9e6cdfc614be4a1ed7b9e630c711008)
Guillermo Herrero [Mon, 25 Sep 2017 10:48:26 +0000 (12:48 +0200)]
Extended PDF support to all baremetal scenarios
JIRA: FUEL-275
Change-Id: I67e8d7ab95e35c78a4f960a12733124fe7bffaec
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
809ea60a05f55d98814f8794a46540edcd2b0298)
Alexandru Avadanii [Tue, 26 Sep 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Run packages upgrade on openstack nodes only" into stable/euphrates
Michael Polenchuk [Mon, 25 Sep 2017 09:25:50 +0000 (13:25 +0400)]
Run packages upgrade on openstack nodes only
Change-Id: I53ac0be519df1bb39a6a56e236285fce95228bd4
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
c15004f402555df4886b18bba9a837288c6ef250)
Michael Polenchuk [Thu, 24 Aug 2017 17:32:00 +0000 (19:32 +0200)]
states: maas: Dynamic node count in stop condition
Change-Id: I7fe8d0c77a1d62e2214fb1089651a639303dd20e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
ed3404128c71d145ed2c697b6b15ea6d016c7550)
Alexandru Avadanii [Mon, 25 Sep 2017 02:36:02 +0000 (04:36 +0200)]
Fix or silence all yamllint warnings
Change-Id: Iface28ab770beee00374afb902ef4f9c983538f5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
597e4b55f57001ead8e90f30e2e3211c7d705ca8)
Alexandru Avadanii [Mon, 25 Sep 2017 23:10:24 +0000 (01:10 +0200)]
patches: Fix context for linux/map.jinja
linux/map.jinja was changed upstream, so our patch (silently)
failed to apply. Adjust the patch context accordingly.
Change-Id: I3493d1926df1303ed823d7ca5dd8282578617f3c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
ec3604c1a30981ad7e9d3a9ea82f61391c1266cf)
Alexandru Avadanii [Sat, 23 Sep 2017 18:48:59 +0000 (20:48 +0200)]
Workaround VCP minions timeout post pkg.upgrade
pkg.upgrade was enabled for all salt minions, including VCP VMs,
which take longer to perform the operation, probably due to an
older set of packages in the Ubuntu disk image we use.
One way to work around this is to switch to UCA Xenial image, and
let Salt pre-provising salt minion on it, but that adds deploy
time delay and has caused issues in the past (should be ok now).
Alternatively, we can retry the pkg.upgrade until all minions
respond, before moving on with the state execution. This prevents
silently skipping the next salt calls (e.g. installing keepalived).
Note that the issue did not manifest for OVD-DPDK, where after
pkg.upgrade, DPDK is installed, giving VCP VMs enough time to return.
While at it, retry 'salt.control' state apply too (non-critical,
but it fails every once in a while).
Fixes:
87310fb
Change-Id: I97acc2b23206a55d72f7e6583ca42127fdbacc16
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
a6feb158fa5bc16b8d496c785c461c73ca715322)
Alexandru Avadanii [Sat, 23 Sep 2017 19:35:03 +0000 (21:35 +0200)]
MaaS: Reduce C/D timeouts, minor fixes
- add new patch for maas.region, extending it poorly with a timeout
override mechanism; the new comissioning/deploying timeout defaults
(10/15min) will be used instead of MaaS defaults (20/40min), unless
reclass params are defined with different values;
- add 30s delay between 'machine mark-broken' and 'machine mark-fixed'
MaaS cli commands (fixes a rare race condition);
- fix forgotten replace in 'maas.pxe_route': s/opnfv_fuel_/opnfv_/g;
Change-Id: I71c562b80031bac2793dd470d52928c2d62e5300
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
01e94712d75c0a1cf7585f0ed380dd9a3967274e)
Alexandru Avadanii [Sat, 23 Sep 2017 14:47:17 +0000 (16:47 +0200)]
reclass: Drop MaaS public IP and interface
MaaS node does not need to be exposed to the public network; instead
the management IP should be enough to access the MaaS dashboard.
So, drop 'infra_maas_node01_external_address' reclass param, together
with its OPNFV PDF param, 'opnfv_infra_maas_node01_external_address'.
This allows us to move compute public IPs back to .{2,3} instead of
.{101,102}, where we moved them during 'pod_config.yml' addition.
While at it, fix a minor duplicate 'name' param for 'br-mgmt' bridge
on kvm nodes.
Change-Id: Ie9fcf5924d7aa37b666f42c968687d73b51a8278
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
ee4d89f2803085bdd4a7f3b365e40ec9366c25a9)
Alexandru Avadanii [Sat, 23 Sep 2017 02:39:01 +0000 (04:39 +0200)]
reclass: pod_config: Revert MaaS IPs to .3
PDF compatible reclass support moved the MaaS IPs from .2 to .3.
However, the runtime template was not updated accordingly, leading
to mismatches between IP addresses. Until all scenarios support
pod_config, we can't apply the IP change correctly, so revert it.
Change-Id: I34e42ec06dd9fd4f69bd7c91dbe068a4f83b3e62
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
187d1c87dfcc86a6b36dfca2c061144dab35bd4d)
Alexandru Avadanii [Sat, 23 Sep 2017 21:51:34 +0000 (21:51 +0000)]
Merge "Pod Descriptor File compatible reclass structure" into stable/euphrates
Alexandru Avadanii [Sat, 23 Sep 2017 02:55:24 +0000 (02:55 +0000)]
Merge "states: maas: Add 30s delay in re-deploy attempt" into stable/euphrates
Alexandru Avadanii [Fri, 22 Sep 2017 17:04:17 +0000 (19:04 +0200)]
states: maas: Add 30s delay in re-deploy attempt
Occasionaly, MaaS fails to provision/deploy some nodes, in which
case we try marking them as broken, then fixed (to put them again
in 'ready' state); before re-attempting the MaaS deploy operation.
However, this leads to 'Error: Internal server error' when deploy
function is called right after transitioning the node to 'ready'
state.
Add a delay of 30 seconds before re-attempting the failed operation.
Change-Id: Ia9ecec67639387e4a29feab3114e1741c554a2cb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit
39ffab99ad34ff45c0ed8be5a8172106e6a819a5)
Michael Polenchuk [Fri, 22 Sep 2017 14:28:58 +0000 (18:28 +0400)]
Adjust memory allocation size
* [baremetal] add memory to contollers & salt master
* tune up sysctl vm.dirty* for compute nodes
* upgrade packages to get the latest versions
(https://bugs.launchpad.net/cinder/+bug/
1641312)
Change-Id: I9ad22206f2f3f11e1da3f93c7a0931c592adf1cf
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
87310fb8edfe49b9621fe4410ae52d989072e3c5)
Guillermo Herrero [Wed, 13 Sep 2017 12:15:07 +0000 (14:15 +0200)]
Pod Descriptor File compatible reclass structure
Implementation for baremetal-mcp-ocata-ovs-ha scenario
JIRA: FUEL-275
Change-Id: Id6ab5697f993ac9faa019c3c10ba4ed4b7b6db01
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
(cherry picked from commit
5c0a09fbd0f377df56bfcfe94b262225a34f98ff)
Michael Polenchuk [Thu, 21 Sep 2017 13:49:56 +0000 (17:49 +0400)]
[virtual] Alter haproxy entry type of odl rest api
Change-Id: Iedb9a57f7ed4b7483bf629225fb2f3470e7de97e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit
80024618fbda8422ba758d667073ad07c6f69542)
Cristina Pauna [Fri, 15 Sep 2017 14:03:00 +0000 (17:03 +0300)]
Remove build instruction from documentation
Fuel/MCP no longer packages the installer in an iso, therefore
these building instructions are obsolete.
JIRA: FUEL-276
Change-Id: Iee587be89078707cf0cf748212b94d69f1769e12
Signed-off-by: Cristina Pauna <cristina.pauna@enea.com>
Michael Polenchuk [Fri, 15 Sep 2017 10:16:42 +0000 (14:16 +0400)]
[ovs/dpdk] Fix location of libvirtd config
Change-Id: If2e3736af02bb0ca53667116377f2fed4385b048
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 14 Sep 2017 17:27:06 +0000 (17:27 +0000)]
Merge "Tune up mysql options"
Michael Polenchuk [Thu, 14 Sep 2017 10:21:03 +0000 (14:21 +0400)]
[baremetal] Switch from 1Gb to 2Mb hugepages
Employ 2Mb hugepages for physical computes as well
since functest suite uses less than 1Gb memory flavors.
Change-Id: I7e96dd73df7d9e7274247b4faba15ee9bd362e40
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 14 Sep 2017 09:01:34 +0000 (13:01 +0400)]
Tune up mysql options
Change-Id: Ib4d787c45434243d0dc29d517a73224cf4f9d1c1
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Wed, 13 Sep 2017 17:08:01 +0000 (17:08 +0000)]
Merge "[virtual] Setup nfs for nova instances"
Alexandru Avadanii [Wed, 13 Sep 2017 17:07:06 +0000 (17:07 +0000)]
Merge "[virtual] Add haproxy entries for opendaylight"
Michael Polenchuk [Wed, 13 Sep 2017 10:39:22 +0000 (14:39 +0400)]
[baremetal] Setup glusterfs for nova instances
Live-migration feature requires shared storage on compute nodes,
so configure glusterfs volume for nova instances.
Change-Id: Id6b9b5aad89f5b4aefbef71e4ba7247a441873b0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 13 Sep 2017 08:43:36 +0000 (12:43 +0400)]
[virtual] Add haproxy entries for opendaylight
Change-Id: Id0303d217dbe71e4b04834e545feae0660172b23
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 13 Sep 2017 08:18:19 +0000 (12:18 +0400)]
[virtual] Setup nfs for nova instances
Configure nfs shared storage for nova instances
to support live migration feature.
Change-Id: I777d5725e45d03325507d3ecc8dd59a28cbc188f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Tue, 12 Sep 2017 15:24:03 +0000 (15:24 +0000)]
Merge "salt-master-init.sh: Use stable 2016.11 salt ver"
Michael Polenchuk [Mon, 11 Sep 2017 15:02:09 +0000 (19:02 +0400)]
Add proxy entries for opendaylight endpoints
Change-Id: I8ebe4dedb9601ae0f45922fd30a34c67382755fc
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Sun, 10 Sep 2017 21:33:36 +0000 (23:33 +0200)]
reclass, states: Parametrize runtime configuration
mcpcontrol virsh network, as well as MaaS PXE network are installer
specific, and not POD specific.
Therefore, these should be easily parametrized without the PDF,
using only installer inputs (e.g. env vars passed via Jenkins).
- add new <all-mcp-ocata-common.opnfv.runtime> reclass class;
- parametrize at runtime new reclass class based on global vars;
- factor out MaaS deploy address / config using new mechanism;
- parametrize at runtime virsh network definitions based on template;
- add new "maas.pxe_route" sls for configuring routing on cfg01;
- replace env vars with the new sls in "maas" state;
NOTE: baremetal parametrization will be handled later.
Change-Id: Ifd61143d818fb088b3f4395388ba769bbc49156e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 10 Sep 2017 18:43:16 +0000 (20:43 +0200)]
salt-master-init.sh: Use stable 2016.11 salt ver
The <salt-master-init.sh> script default to using stable 2016.3
version of Salt via BOOTSTRAP_SALTSTACK_OPTS.
However, since we manually add the 2016.11 repos beforehand, the
correct version (2016.11) ends up being installed.
This change merely drops one uselss repo from salt master apt sources.
While at it, use HTTPS for repo.saltstack.com DEB repository.
Since we already add the repo to apt sources via <user-data.sh>,
pass "-r" on all architectures, skipping repo (re)addition.
Change-Id: I7fbe0b646b2f2a8e952718a61ff8c180116f8f27
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 10 Sep 2017 20:04:58 +0000 (22:04 +0200)]
salt master, maas: Move mcpcontrol to 10.20.0.0/24
Use INSTALLER_IP Jenkins param instead of SALT_MASTER_IP, allowing
us to drop SALT_MASTER_IP completely from releng.
mcpcontrol IP changes:
- 192.168.10.100 becomes 10.20.0.2 (align with legacy Fuel master);
- 192.168.10.3 becomes 10.20.0.3 (baremetal MaaS address);
JIRA: FUEL-285
Change-Id: I6e2d44c3a8b43846196bd64191735214167a76ce
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 11 Sep 2017 17:08:54 +0000 (17:08 +0000)]
Merge changes from topic 'multiarch-image-defaults'
* changes:
reclass: virtual: Factor out VM interface naming
reclass: Multiarch support for arch specific param
Alexandru Avadanii [Sun, 10 Sep 2017 00:37:11 +0000 (02:37 +0200)]
reclass: virtual: Factor out VM interface naming
Define two groups of VM interface naming:
- ens3..ens6 - used by infra VMs, virtual node VMs;
- ens2..ens3 - used by VCP VMs (spawned by salt.control);
Parametrize newly defined interface names throughout the cluster
models.
While at it, add AArch64 default values for above iface names.
NOTE: baremetal clusters will be parametrized later, after common
config is factored out into <baremetal-mcp-ocata-common>.
Change-Id: I89aba9aaf85b585cc510302eb76d7810fbf60679
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 9 Sep 2017 23:52:18 +0000 (01:52 +0200)]
reclass: Multiarch support for arch specific param
Introduce a simple mechanism that simulates an 'if-arch-then' cond
for reclass models:
- add new <all-mcp-ocata-common> class hierarchy;
- at runtime (via <salt.sh>) make 'all-mcp-ocata-common.arch' point
to 'all-mcp-ocata-common.$(uname -i)' dynamically;
- inherit new 'arch' class in all cluster models;
- factor out current x86_64 default for "salt_control_xenial_image";
- add AArch64 default for param "salt_control_xenial_image";
Change-Id: I3b239b28d0fd1cc2ced8579e2e93b764eb71ffc3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 10 Sep 2017 23:54:16 +0000 (01:54 +0200)]
README files: Convert from markdown to RST
Change-Id: I176f583e8adb7ba717932de7c27283f696ded548
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 11 Sep 2017 12:07:05 +0000 (12:07 +0000)]
Merge "Add & fix licensing in README.rst files, align ext"
Michael Polenchuk [Mon, 11 Sep 2017 08:27:21 +0000 (08:27 +0000)]
Merge "os_cacert: Parametrize VIP used in path by cp.push"
Michael Polenchuk [Mon, 11 Sep 2017 08:11:32 +0000 (08:11 +0000)]
Merge "scenario: Add AArch64 defaults"
Michael Polenchuk [Mon, 11 Sep 2017 08:11:03 +0000 (08:11 +0000)]
Merge "reclass: virtual: Factor out common infra config"
Michael Polenchuk [Mon, 11 Sep 2017 08:08:01 +0000 (08:08 +0000)]
Merge "log.sh: Collect /var/log from cluster nodes"
Alexandru Avadanii [Sat, 9 Sep 2017 23:11:23 +0000 (01:11 +0200)]
Add & fix licensing in README.rst files, align ext
Rename all variations of README files to README.rst.
Fix license headers according to OPNFV Contribution Guidelines [1].
Markdown syntax will be switched to rst in an ulterior change.
[1] https://wiki.opnfv.org/display/DEV/Contribution+Guidelines
Change-Id: I2c71fd62b38f218545507c79c39e07dbd35f7c88
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Sep 2017 22:08:49 +0000 (00:08 +0200)]
os_cacert: Parametrize VIP used in path by cp.push
JIRA: FUEL-274
Change-Id: Ia77948ba3e99c47aa86fcca20c67d80e2e761208
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 9 Sep 2017 19:33:34 +0000 (21:33 +0200)]
scenario: Add AArch64 defaults
Move scenario defaults.yml out of virtual/baremetal dirs, unifying
them into a single, arch-specific defaults configuration file.
Add AArch64 equivalent config, and arch-qualify default filename.
For AArch64, bump VCPU number from 2 to 6.
Change-Id: If9b39850af96e4c46e868b1d532bd301f9fd9f26
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 9 Sep 2017 17:35:16 +0000 (19:35 +0200)]
reclass: virtual: Factor out common infra config
Change-Id: I669a81cf46a4ac988a1ea04c3b9d297ae67a0a62
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 9 Sep 2017 01:09:18 +0000 (03:09 +0200)]
log.sh: Collect /var/log from cluster nodes
Bring back <ci/deploy.sh> parameter `-L`, which is already passed by
releng deploy script.
Since we need to enable file_recv on salt master, do so by adding a
new class in <virtual-mcp-ocata-common/infra/config.yml>, which will
be inherited by all scenario reclass models.
JIRA: FUEL-288
Change-Id: I9b649315984fb8580b63883d0e06c1e1efd11057
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Sep 2017 19:19:01 +0000 (21:19 +0200)]
bash scripts: Fix remaining shellcheck warn/errs
Fix/silence all shellcheck errors, except for scripts in
<prototypes/sfc_tacker>.
Change-Id: Idc317cdba0f69b78299f2d3665e72ffc19dd8af5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 8 Sep 2017 17:34:50 +0000 (17:34 +0000)]
Merge "Move mcp.rsa to /var/lib/opnfv"
Alexandru Avadanii [Fri, 8 Sep 2017 15:19:21 +0000 (15:19 +0000)]
Merge "lib.sh: Remove all storage on undefine"
Michael Polenchuk [Fri, 8 Sep 2017 11:26:17 +0000 (15:26 +0400)]
[ovs/dpdk] Mend dpdk settings
* add vcpus to virtual compute
* re-pin dpdk core & pmds
* switch to UCA repos
* disable apt-daily cron job
Change-Id: Ia23100b846d8954e3d5e8a264a6b8518402b2fa6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 7 Sep 2017 19:55:16 +0000 (21:55 +0200)]
lib.sh: Remove all storage on undefine
While executing the deploy script via sudo will raise no issues with
re-using old storage volume files, non-root deploys fail to change
ownership of said files.
Properly clean after ourselves when destroying and undefining VMs.
JIRA: ARMBAND-311
Change-Id: I7fdd269dccbfd5ab5285d852ac7dacfc4dc5ccd7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 7 Sep 2017 18:38:13 +0000 (20:38 +0200)]
Move mcp.rsa to /var/lib/opnfv
JIRA: FUEL-280
Change-Id: I1e07b0e1597b2a1e4a92e1274f89dda62cb81bb8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 7 Sep 2017 17:04:01 +0000 (17:04 +0000)]
Merge "cleanup: Rename ODL-L3 to ODL, drop ODL-L2"
Alexandru Avadanii [Thu, 7 Sep 2017 01:06:55 +0000 (01:06 +0000)]
Merge "Initialize mongodb cluster"