Michael Polenchuk [Wed, 30 Aug 2017 10:24:05 +0000 (14:24 +0400)]
Update salt init scripts source
Change-Id: I269e397b78d55794b1c49bf582cc0e663cbe9ca6
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 30 Aug 2017 05:31:23 +0000 (05:31 +0000)]
Merge "lib.sh: Reuse /tmp/mcp.rsa if present"
Alexandru Avadanii [Mon, 28 Aug 2017 23:21:30 +0000 (01:21 +0200)]
states: maas: Retry linux state if no response
JIRA: FUEL-283
Change-Id: Ie85af8c12163fac28cb8826aa8902a4ff3dec623
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 29 Aug 2017 22:15:22 +0000 (00:15 +0200)]
patches: seedng: Fix arg order for salt-bootstrap
JIRA: FUEL-282
Change-Id: I8ba64024c884e2f805d4cda670333ac787fac25c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 29 Aug 2017 21:09:33 +0000 (23:09 +0200)]
reclass: virtual-mcp-ocata-ovs: Fix yaml typo
Change-Id: Icc283315bbf0df825e9836913deff821bad1123a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 29 Aug 2017 00:35:37 +0000 (02:35 +0200)]
lib.sh: Reuse /tmp/mcp.rsa if present
Long-term, /tmp/mcp.rsa should be moved to a persistent location [1],
and made configurable via env var / other mechanisms.
This will allow us to:
- use an existing keypair (provided by end-user in expected path);
- login to previous deployment machines (e.g. to cleanup UEFI boot
entries before destroying the cluster and rebuilding it);
- split deploy in re-entrant stages (salt master only, cluster nodes
only; similar to old Fuel, where we could reuse old Fuel VM);
[1] https://jira.opnfv.org/browse/FUEL-280
Change-Id: I1e53321ed1cfc217ff95e809c867fa3370c479c9
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 29 Aug 2017 16:16:38 +0000 (16:16 +0000)]
Merge "[virtual] Apply ceilometer/aodh services"
Michael Polenchuk [Tue, 29 Aug 2017 10:16:14 +0000 (14:16 +0400)]
[baremetal] Return back custom image for vcp nodes
Virtual node based on cloud ubuntu image
won't register as a minion on salt master.
Change-Id: Ia32eae01a5633042189cdebebcba8043cae61503
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 18 Aug 2017 09:55:40 +0000 (13:55 +0400)]
[virtual] Apply ceilometer/aodh services
* run ceilometer/aodh states
* wrap common virtual cluster options
* get the source image based on timestamps
Change-Id: I88f1d63ed4a94eba4ec0a9cf33d36d51c75ae355
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 28 Aug 2017 22:50:56 +0000 (00:50 +0200)]
patches: seedng: module: Sync salt version
JIRA: FUEL-282
Change-Id: I6c86ce0b1113ca674b1756e7997559eee90a4e5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Mon, 28 Aug 2017 10:50:03 +0000 (14:50 +0400)]
Sync os cacert from proxy to salt master
JIRA: FUEL-274
Change-Id: I2c8161b24cb18a0d1f9dc6fd509ce18af7ea8cf5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 25 Aug 2017 11:47:55 +0000 (15:47 +0400)]
[baremetal] Add required user on vcp nodes
* add user of "ubuntu" so that functest gets cluster credentials
* reduce cpu resources for vcp nodes in nofeature scenario
* tune salt targets for maas state
* specify ntp servers
Change-Id: I433a1de1cd2c69c6747c62c3359f5485dee3bfa4
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 24 Aug 2017 11:45:04 +0000 (15:45 +0400)]
[baremetal] Bring in ovs/dpdk scenario
Change-Id: Ia0d828fa31549a12b6740e0edeeba2ab13a9b998
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 24 Aug 2017 06:07:24 +0000 (06:07 +0000)]
Merge "MaaS: commissioning/deployment retry"
Michael Polenchuk [Thu, 24 Aug 2017 06:04:09 +0000 (06:04 +0000)]
Merge "ci/deploy.sh, states: bash debug, continue on err"
Alexandru Avadanii [Wed, 23 Aug 2017 02:23:26 +0000 (04:23 +0200)]
MaaS: commissioning/deployment retry
While at it, parametrize max attempt number in maas state's "wait_for",
and reduce retries count for certain simpler tasks.
Change-Id: I3ac2877719cdd32613bcf41186ebbb9f3f3aee93
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 23 Aug 2017 14:28:04 +0000 (16:28 +0200)]
ci/deploy.sh, states: bash debug, continue on err
Since we don't `set -e` in state files, applying each state will
always succeed unless the last instruction in the state fails.
Make this uniform by always succeeding in applying the state.
While at it, enable bash debugging logs, for better readability
of deploy log files.
Change-Id: I3cf4886f6d73c6fd1380df1a4e1413334bec1701
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Wed, 23 Aug 2017 10:19:32 +0000 (14:19 +0400)]
[baremetal] Bring in opendaylight scenario
Change-Id: I3a9bb25fc7514055da588b9047f61af178eff222
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 23 Aug 2017 10:31:48 +0000 (14:31 +0400)]
Locate toplevel for git submodule
Prior to git 1.8.4 the current working dir has to
be at top-level to run git submodule update.
Change-Id: I4d6c052364863f965e8140e56af17c09ee39ed59
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 23 Aug 2017 05:22:19 +0000 (05:22 +0000)]
Merge "states/network: parametrize Openstack public net"
Alexandru Avadanii [Tue, 22 Aug 2017 20:04:28 +0000 (22:04 +0200)]
states/maas: Add mcp.rsa.pub to authorized_keys
Add our mcp.rsa.pub RSA key to all nodes, including VCP VMs.
This is required for functest to be able to fetch openrc.
While at it, add retry wrappers for more VCP VM state.sls calls.
Change-Id: I34f79848c52e36de8d981055880321a081420874
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 16:54:16 +0000 (18:54 +0200)]
states/network: parametrize Openstack public net
Determine public network based on public IPs of compute nodes.
Change-Id: I5a6b29a0458b0b839f8fdb3e32616a41d7a621f7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Tue, 22 Aug 2017 11:22:34 +0000 (15:22 +0400)]
Configure neutron gateway
Change-Id: I01744bd5728d6fc4c8cd3792aee9759434d18645
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 22 Aug 2017 08:41:59 +0000 (12:41 +0400)]
Return back infra interfaces config
Change-Id: I4baa9940ae14ef6e084fda7169ec43be7cf3f449
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 22 Aug 2017 07:49:42 +0000 (11:49 +0400)]
Shift vcp nodes interfaces
* shift vcp nodes interfaces since names started from ens2
* add extra salt sync before vcp start up
* run rabbitmq state on 1st node beforehand then the rest
Change-Id: Ic2c174c288a5e89f2f28c0d9aa573340190a61d3
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 21 Aug 2017 22:07:39 +0000 (00:07 +0200)]
baremetal: HA: Standalone openstack_ha state
Replicate all calls from "openstack" state to "openstack_ha",
while adjusting minor parameters for HA, based on [1].
[1] https://docs.mirantis.com/mcp/1.0/mcp-deployment-guide/\
deploy-mcp-cluster-manually.html
Change-Id: Iaf2262fa9c54f2401b69635ff46329ffb856f802
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 22 Aug 2017 00:19:34 +0000 (02:19 +0200)]
states: maas: Retry applying VCP VMs linux state
Running a heavy state like `linux` on all nodes (including VCP VMs)
might time out the first time on slower systems.
Change-Id: I21a3ad380afafa833f59e14da86aff92e254e9c7
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 21 Aug 2017 20:26:09 +0000 (22:26 +0200)]
reclass: baremetal: openstack: Fix eth assignment
Baremetal support introduced a couple of VCP VMs, which have 2
network interfaces:
- primary (ens3 inside x86 VM) - connected to "br-mgmt" bridge on
each kvm node, serves for MaaS DHCP / connection to salt master;
- secondary (ens4 inside x86 VM) - connected to "br-ctl" bridge on
each kvm node, serves for Openstack Management network;
However, the reclass model was configured to use a single IP address
on the primary interface, breaking the connnection to salt master,
while also not connecting the Openstack Management network properly.
Fix this by configuring the primary interface for DHCP, while the
secondary gets a static IP in Openstack Management network.
Change-Id: I9f1d6f080e882bfaae7b5f209bc3c5536826ba06
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Mon, 21 Aug 2017 16:36:14 +0000 (20:36 +0400)]
Cleanup outdated salt keys
Remove keys that are left over from the previous deployment
to avoid interfere with the new ones.
Change-Id: I0dfa9782cbce9a8e8b7c1efe5954c8ffe85996f9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Mon, 21 Aug 2017 15:38:38 +0000 (19:38 +0400)]
Swap vcp nodes interfaces
In order to connect to right underlay
bridge, swap interfaces.
Change-Id: I0ae1f50e8d1f3485404bd7e6eea772cab555b313
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Mon, 21 Aug 2017 15:09:35 +0000 (15:09 +0000)]
Merge "virtual: odl-router: Stop overriding Ubuntu repos"
Alexandru Avadanii [Mon, 21 Aug 2017 15:04:35 +0000 (15:04 +0000)]
Merge "maas: Break infinite loops into finite retries"
Michael Polenchuk [Mon, 21 Aug 2017 13:12:29 +0000 (17:12 +0400)]
Check out all vcp nodes are available
Change-Id: I86bb27b323152440e8a885dbf867da433a288dae
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Sun, 20 Aug 2017 15:52:56 +0000 (17:52 +0200)]
maas: Break infinite loops into finite retries
While at it, move the bash commands to a separate script file.
Change-Id: Ib78b5b7f7083ed866e5d42e8340df7b27198f276
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 19 Aug 2017 21:56:46 +0000 (23:56 +0200)]
patches: Add missing patch metadata line
Change-Id: I35735c0d35c6004c546a704cee3d6d94ce077225
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 19 Aug 2017 21:33:42 +0000 (23:33 +0200)]
MaaS: Add support for dynamic fabric numbering
Previously, we hardcoded the fabric name for our 3rd interface
(which serves PXE/DHCP for the target nodes) to "fabric-2",
relying on predictable index numbers to be provided by MaaS based
on the interfaces defined in /etc/network/interfaces.
However, the fabric IDs/names generated by MaaS are not predictable,
and therefore cannot be hardcoded in our reclass model / scripts.
Work around this by:
- adding support for fabric ID deduction based on CIDR matching
during subnet create/update operation in MaaS py module;
- adding support for VLAN DHCP enablement to MaaS py module,
which was previously handled via shell MaaS API operations
from maas/region.sls;
While at it, revert previous commit that disabled network discovery
("MaaS: Disable network discovery"), since it turns out that network
discovery was not the culprit for subnet creation failure, but wrong
fabric numbering.
This reverts commit
8cdf22d1a1bae4694a373873cab4feb6251069b7.
Change-Id: I15fa059004356cb4aaabb38999ea378dd3c0e0bb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 19 Aug 2017 01:03:24 +0000 (01:03 +0000)]
Merge "MaaS: Disable network discovery"
Alexandru Avadanii [Sat, 19 Aug 2017 00:33:34 +0000 (02:33 +0200)]
maas state: Add debug output to grep query loops
Change-Id: Ic47a9dd2d5a4cccc9c4330509d81aba82f777084
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 23:18:02 +0000 (01:18 +0200)]
MaaS: Disable network discovery
In case nodes are already powered on and have an IP in the same
range as the new MaaS DHCP one (e.g. from a previous deploy),
MaaS API will reject the subnet creation due to overlapping
addresses. Try to work around this by disabling network discovery.
Change-Id: I70a33c552bf38a7ccbc1bb7e90c21f424f082bc5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 21:14:14 +0000 (21:14 +0000)]
Merge "MaaS: DHCP iprange fix: use dynamic, not reserved"
Alexandru Avadanii [Fri, 18 Aug 2017 21:09:06 +0000 (23:09 +0200)]
MaaS: DHCP iprange fix: use dynamic, not reserved
Without the 'type' parameter set to 'dynamic', MaaS was configured
to reserve the IP range instead of allocating it dynamically.
This led to IP exhaustion warnings in MaaS dashboard, as well as
wrongful IP allocation.
Change-Id: I1f2b90bf4cd2393cfab6d4bc17771cef009701c0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 18:42:00 +0000 (20:42 +0200)]
maas.region: Add port to all MaaS API URLs
Change-Id: I6ecc81cc6faf45f33882666b9f537a3e42ad379e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 17:02:46 +0000 (19:02 +0200)]
maas.region: Add missing port to maas_url
Change-Id: Iae9991f9148ac518696f9f8b57b5a8ca9dded730
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 15:43:05 +0000 (17:43 +0200)]
linux.network: Fix noifupdown in linux/map.jinja
Previous changes attempted to add 'noifupdown' support, but failed
to spell it correctly. Fix the typo and also edit the 'maas' state
to use simple `salt state.apply` instead of `cmd.run 'salt-call'`.
Change-Id: If9889dee896fa100febe0372fe2c4173fc223ee3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 18 Aug 2017 14:08:23 +0000 (16:08 +0200)]
MaaS node: Fix dhcp_interface config
Explicitly configure dhcp_interface for mas01, in order to allow
the interface name to be parametrized via "dhcp_interface" _param.
Change-Id: I6a2750adc1941c0aa1f94ac9b39133b5bd2388c6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Fri, 18 Aug 2017 10:03:16 +0000 (14:03 +0400)]
Apply network config on kvm nodes
* re-assign ip from interface to bridge
- install bridge utils
- make a reboot straight away after network config
* change image source for vcp
Change-Id: I34506ee161337b5d3a4088cfdf3c082d99ccb695
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 18 Aug 2017 06:52:45 +0000 (06:52 +0000)]
Merge "patches: linux.system.single fixed upstream"
Alexandru Avadanii [Thu, 17 Aug 2017 23:44:17 +0000 (01:44 +0200)]
ci/deploy.sh: yum install --skip-broken
Change-Id: I8098eff73ab15fe58cb357db99df76e1bd160652
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 18:44:28 +0000 (20:44 +0200)]
patches: linux.system.single fixed upstream
Fixed upstream in [1], drop our patch.
[1] https://github.com/Mirantis/reclass-system-salt-model/commit/
573be77
Change-Id: Ieeb9b87cac0418d860bbf04e5e8ffd48898a213e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 17 Aug 2017 16:40:38 +0000 (16:40 +0000)]
Merge "Bring in baremetal support"
Alexandru Avadanii [Thu, 17 Aug 2017 14:48:12 +0000 (16:48 +0200)]
lib.sh: Fix mcp key owner for OPNFV Jenkins jobs
In case of non-root deploys (i.e. running `ci/deploy.sh` without
sudo), the OPNFV Jenkins slave executes it under a user shell,
under a root shell, e.g.:
$ sudo sudo -u jenkins bash
$ echo $USER
jenkins
$ echo $SUDO_USER
root
Adjust lib.sh to only use SUDO_USER when it is not "root".
Change-Id: I6dd1c8a5dd3a3b02cfb760818d66e99f49709a5b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 1 Aug 2017 20:18:41 +0000 (22:18 +0200)]
Bring in baremetal support
- ci/deploy.sh: fail if default scenario file is missing;
- start by copying reclass/classes/cluster/virtual-mcp-ocata-ovs as
classes/cluster/baremetal-mcp-ocata-ovs;
- add new state (maas) that will handle MaaS configuration;
- Split PXE network in two for baremetal:
* rename old "pxe" virtual network to "mcpcontrol", make it
non-configurable and identical for baremetal/virtual deploys;
* new "pxebr" bridge is dedicated for MaaS fabric network, which
comes with its own DHCP, TFTP etc.;
- Drop hardcoded PXE gateway & static IP for MaaS node, since
"mcpcontrol" remains a NAT-ed virtual network, with its own DHCP;
- Keep internet access available on first interfaces for cfg01/mas01;
- Align MaaS IP addrs (all x.y.z.3), add public IP for easy debug
via MaaS dashboard;
- Add static IP in new network segment (192.168.11.3/24) on MaaS
node's PXE interface;
- Set MaaS PXE interface MTU 1500 (weird network errors with jumbo);
- MaaS node: Add NAT iptables traffic forward from "mcpcontrol" to
"pxebr" interfaces;
- MaaS: Add harcoded lf-pod2 machine info (fixed identation in v6);
- Switch our targeted scenario to HA;
* scenario: s/os-nosdn-nofeature-noha/os-nosdn-nofeature-ha/
- maas region: Use mcp.rsa.pub from ~ubuntu/.ssh/authorized_keys;
- add route for 192.168.11.0/24 via mas01 on cfg01;
- fix race condition on kvm nodes network setup:
* add "noifupdown" support in salt formula for linux.network;
* keep primary eth/br-mgmt unconfigured till reboot;
TODO:
- Read all this info from PDF (Pod Descriptor File) later;
- investigate leftover references to eno2, eth3;
- add public network interfaces config, IPs;
- improve wait conditions for MaaS commision/deploy;
- report upstream breakage in system.single;
Change-Id: Ie8dd584b140991d2bd992acdfe47f5644bf51409
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sun, 13 Aug 2017 16:35:24 +0000 (18:35 +0200)]
virtual: odl-router: Stop overriding Ubuntu repos
Keep UCA default apt sources, instead of overriding them with arch
specific values from:
- system.linux.system.repo.ubuntu
Change-Id: I1edc725a97ae6290d316a7916c27fd904f59db04
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 11 Aug 2017 13:35:24 +0000 (13:35 +0000)]
Merge "maas: region: credentials workaround, force sync"
Alexandru Avadanii [Fri, 11 Aug 2017 13:24:18 +0000 (13:24 +0000)]
Merge "lib.sh: AArch64: Use VGA video mode for guests"
Alexandru Avadanii [Tue, 11 Jul 2017 16:35:40 +0000 (18:35 +0200)]
lib.sh: AArch64: Use VGA video mode for guests
On AArch64, there is no Cirrus video, so use VGA mode instead.
On Debian systems, also fix a missing link for vgabios-stdvga.bin.
Based on previous Armband work from [1].
[1] https://github.com/opnfv/armband/blob/danube.2.0/patches/fuel-library/
arm64-bug-fixes/0002-Install-vgabios-and-link-for-aarch64.patch
Change-Id: Ia84ea5536b68e14993b719488375b0041183a767
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Fri, 11 Aug 2017 10:30:45 +0000 (10:30 +0000)]
Revert "Switch distrib revision to testing"
There is no much difference between nightly vs testing repos.
This reverts commit
052a1626da71d232431b3a9faf576a76db61f10e.
Change-Id: I40f60ddc2c9e1e59c7c4eb0be59ae19b00b7fb9b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Sat, 5 Aug 2017 00:25:38 +0000 (02:25 +0200)]
maas: region: credentials workaround, force sync
Workaround the issues described in [1], stating that salt-formula-maas
package cannot set an autogenerated PostgreSQL password, respectively
the known error thrown during initial setup.
FIXME: These should be reverted later, after fixing the MaaS password
update and initial artifact sync in the salt formula / scripts.
[1] https://docs.mirantis.com/mcp/1.0/mcp-deployment-guide/\
install-base-infra/set-up-bare-metal-provisioner/configure-maas-vm.html
Change-Id: I8b37f55d3caa4119c64f9549578850dd4eb9e3ad
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Wed, 9 Aug 2017 11:15:36 +0000 (15:15 +0400)]
Synchronize down all of the dynamic modules
Sync all of the salt dynamic modules to make sure custom
modules, states, grains & etc. are on the target nodes.
Change-Id: I04f2ac0465d5381c4c07623e9383619d9b9731de
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 8 Aug 2017 07:38:39 +0000 (11:38 +0400)]
Switch distrib revision to testing
In order to avoid bleeding edge issues with nightly version of
salt formulas, switch to "safe" testing repo source.
Change-Id: I9d12f337c3952711cb8843943c23315795064016
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Sun, 6 Aug 2017 16:56:43 +0000 (16:56 +0000)]
Merge "ci/deploy.sh: Allow non-root deploys"
Michael Polenchuk [Thu, 3 Aug 2017 08:56:26 +0000 (08:56 +0000)]
Merge "Set ntp servers list"
Alexandru Avadanii [Wed, 2 Aug 2017 13:40:07 +0000 (13:40 +0000)]
Merge "reclass: opendaylight: Use UCA default repos"
Alexandru Avadanii [Wed, 2 Aug 2017 13:39:48 +0000 (13:39 +0000)]
Merge "mcp/config: Move scenario defs to separate dir"
Michael Polenchuk [Wed, 2 Aug 2017 11:43:10 +0000 (15:43 +0400)]
Set ntp servers list
* set ntp sweden servers list for virtuals
* wrap common cluster init options
Change-Id: I044802998d5498fed969e62bf1ea8c814652f34f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 2 Aug 2017 09:10:26 +0000 (13:10 +0400)]
[odl-router] Bring up public network on computes
* apply provider mappings on compute nodes as well
* set default route of computes to gateway node
Change-Id: I5715e34fd8ecbed87bd7f1b1ed488766af711bae
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Tue, 1 Aug 2017 20:06:11 +0000 (22:06 +0200)]
mcp/config: Move scenario defs to separate dir
Prepare for adding baremetal scenarios by moving existing scenario
definitions (intended for deploys on virtual PODs) to their own
subdirectory.
Change-Id: Iaa75e0b0a9876e4f263fc6bbae796d97848ef99b
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Mon, 17 Jul 2017 23:10:25 +0000 (23:10 +0000)]
ci/deploy.sh: Allow non-root deploys
Currently, deploying Fuel@OPNFV requires the `ci/deploy.sh` to be ran
as root user, for:
- hypervisor access (virsh);
- installing prerequisite packages;
We can support non-root deploys if we relax above restriction into:
- current user should have hypervisor access beforehand
(new check added);
- current user has passwordless sudo rights, for installing packages;
Later, we should move the package installation out of the deploy
script (`ci/deploy.sh`), making the whole deploy possible without
sudo, only hypervisor access.
After this change, the old way (sudo ci/deploy.sh) should work just
like it used to before, so no regression/behavior change should be
introduced with this.
Change-Id: Ib2ea96aa7b6d67ba0606318407a8adeb51e6969d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Thu, 27 Jul 2017 18:09:46 +0000 (20:09 +0200)]
reclass: opendaylight: Use UCA default repos
Current opendaylight pillar enforces a full apt repository cleanup,
removing Ubuntu Cloud Archive (UCA) repos in favor of adding
pre-hardcoded Ubuntu archive repos.
Unlike UCA, main Ubuntu archive is split based on target arch, the
main archive.ubuntu.com holding only x86 packages, while the other
archs are hosted on ports.ubuntu.com.
This leads to adding (only) x86-specific repositories to our AArch64
UCA image.
Mitigate this by ommiting "system.linux.system.repo.ubuntu" from the
opendaylight pillar, leaving the default UCA repos in place.
Change-Id: Ia7033bcb544d8752d5557bbabc92c92c5008b00c
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 1 Aug 2017 17:48:33 +0000 (19:48 +0200)]
ci/deploy.sh: Fix "notify" on dumb terminals
Dumb terminals (which do not support colors), like "vt220",
make `tput setaf` return with an error code, hence bypassing the
actual print.
Change-Id: Id838583beb30a810aec478ed80d452c6f3203e0f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 29 Jul 2017 20:49:26 +0000 (22:49 +0200)]
salt.sh: Drop upstream clone in favor of local git
salt.sh currently clones the full Fuel@OPNFV git repo from upstream
public mirror, preventing us from testing locally edited or new
patches.
Instead, bring back git submodule handling from old f_repos, clone
and patch each submodule locally, then copy the whole parent repo
over to cfg01.
This is also a first step towards implementing offline deploy support.
NOTE: This adds new deploy prerequisite packages:
- git (for submodule clone/update);
- make (for submodule patching);
- rsync (for parent repo replication to cfg01);
NOTE: Parent repository is expected to be a git repo, in order to
work with git submodules.
While at it, perform some minor related changes:
- add deploy artifacts (ISOs, qcow2 files) to .gitignore, also used
to filter-out such files during rsync to cfg01;
- remove obsolete Fuel patches (old f_repos mechanism);
- rename "reclass-system-salt-model" submodule;
Change-Id: I6210d80d41010b2802e4f1b31acf249a18db7963
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 28 Jul 2017 22:34:31 +0000 (00:34 +0200)]
mcp/scripts: shellcheck cleanup
Change-Id: I280d540b461341e14de654186016248eba4d3521
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 28 Jul 2017 01:50:09 +0000 (03:50 +0200)]
ci/deploy.sh: MCP cleanup, sanity checks
- disable false-positive shellcheck errors;
- fix obsolete backtick usage;
- move obsolete arguments to separate section;
- add color-enabled "notify" macro for warn/err messages;
- remove obsolete code intended for old Fuel;
- fix quoting and double-quoting shellcheck warnings;
- minor code changes for better readability;
- remove "no healthcheck" flag (obsolete);
- add mandantory arguments validation;
Change-Id: I991836adc8d76466f2b83b1e472bb9ef6989fff3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Tue, 25 Jul 2017 17:11:56 +0000 (19:11 +0200)]
ci/deploy.sh: Rework bridge arguments for MCP
Change-Id: I20d6dedeaa31f7986eaa35be49c5388c3fdb4b83
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Fri, 21 Jul 2017 17:59:33 +0000 (19:59 +0200)]
lib.sh: Use host-passthrough when spawning VMs
virsh defaults to using "host-model" instead of "host-passthrough",
which not only might lead to a small performance hit on x86, it is
also causing compatibility issues with libvirt 3.x.
Address this by explicitly requesting "host-passthrough" as the
CPU model for virt-install.
Change-Id: Ia7c5e8ff906c02fed2193c268cbb3594c5607bc6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Mon, 31 Jul 2017 08:32:09 +0000 (12:32 +0400)]
[odl-router] Add missing nodes config
Change-Id: Id7603aa581e4ccdddad1cf93f9434fe95c047800
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Mon, 31 Jul 2017 07:45:30 +0000 (11:45 +0400)]
Set key owner to original user in case of sudo
Change-Id: If964d36ad4f0cb6f1b2caf8544d4e35487f59c6c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 14 Jul 2017 07:11:32 +0000 (11:11 +0400)]
Bring in opendaylight L3/router scenario
Change-Id: I8a3be1764de136e2ecf81f964233483be5d6655a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Alexandru Avadanii [Thu, 27 Jul 2017 22:52:36 +0000 (00:52 +0200)]
mcp/user-data: Pin saltstack repo to 2016.11
Latest saltstack repository recently pushed a new version of
"salt-api" which breaks compatibility with current Fuel@OPNFV code.
For now, let's pin saltstack repo to the most recent stable version.
Change-Id: I2a7e11d4fb50a8c62220f3f29ded5955fa69aef0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 26 Jul 2017 17:06:31 +0000 (19:06 +0200)]
lib.sh: cleanup_vms: Also remove VMs that use UEFI
Pass `--nvram` to `virsh undefine`, so guest VMs booted using
UEFI (OVMF on x86 or AAVMF on AArch64) can be destroyed.
This does not affect VMs without UEFI.
While at it, fix logical error in previous commit adding support
for cleaning up stopped VMs.
Change-Id: I44c20566469f29a8683d81e3641c69da572ccd4e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Wed, 26 Jul 2017 16:53:04 +0000 (18:53 +0200)]
lib.sh: cleanup_vms: Also remove stopped MCP VMs
In case the cfg01 & co. VMs are in "shut off" state, `virsh --name`
will ommit them, which leads to `cleanup_vms` leaving behind stale
VMs. Add `--all` arg to list all VMs, including stopped ones.
Change-Id: Ia550a10eb0b40138f87ade709336c2871a8b1cd8
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
zhihui wu [Wed, 19 Jul 2017 14:26:28 +0000 (22:26 +0800)]
[bugfix]invalid user ‘jenkins’
See https://build.opnfv.org/ci/job/fuel-deploy-zte-pod1-daily-master/456/console
In lib.sh, generate_ssh_key() assumes that "jenkins" is
the current user name. But on zte-pod1, the ci user name
isn't jenkins. It is better to use $USER replaced "jenkins".
JIRA:FUEL-273
Change-Id: I6ec6847eccd055b8b4062dd202f8f0a24ba6dd73
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>
Alexandru Avadanii [Tue, 18 Jul 2017 15:34:07 +0000 (15:34 +0000)]
Merge "mcp: openstack: Install & configure horizon"
Alexandru Avadanii [Sat, 15 Jul 2017 17:58:48 +0000 (19:58 +0200)]
mcp: openstack: Install & configure horizon
Change-Id: I2f6b136efebfee95a9a192c40afb88d20bbacef0
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Alexandru Avadanii [Sat, 15 Jul 2017 16:18:55 +0000 (18:18 +0200)]
mcp: lib.sh: virt-install --noautoconsole
When X server is available, virt-install tries opening virt-viewer
automatically (for each newly created VM), which blocks the
deployment until the user closes the virt-viewer window.
Without X, virt-install just throws a warning and moves on.
Fix both of the above by passing the "--noautoconsole" argument to
virt-install.
Change-Id: I7df839aa902f7629dec11d24905fc05d1070f9db
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Michael Polenchuk [Thu, 13 Jul 2017 12:35:25 +0000 (16:35 +0400)]
Tune network sysctl options
* tune net/tcp opts
* handle vcpus setting for vms
* fix tempest issue with public subnets visible
* set reclass data source to local to avoid git clone
Change-Id: Ibac9eba8234ebb20854c03b399405968cb2069e8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 12 Jul 2017 08:29:30 +0000 (12:29 +0400)]
Apply reclass patches before salt master init
Change-Id: I7bb984880e98b7bdec9aa0b3895a3be9fd75cac0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 11 Jul 2017 07:41:08 +0000 (11:41 +0400)]
Apply upstream patches
For opendaylight support:
* neutron formula
* reclass system model
Plus missing apply of haproxy state.
Change-Id: Ic9e3672b51d5331656d636c44c3f891e49437e23
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 11 Jul 2017 11:27:41 +0000 (15:27 +0400)]
Set public endpoints to external interface
In order to pass functest/api_check, configure public endpoints of
openstack core services with external ip address.
Change-Id: I519865df5700acbcf542ea71efd87780e9f1d9d5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 7 Jul 2017 11:42:36 +0000 (15:42 +0400)]
Align reclass cluster model of dpdk scenario
Change-Id: I4fc0c0e040c97e91c79aae2f0142fb6f025081f2
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 6 Jul 2017 08:27:56 +0000 (12:27 +0400)]
Enable cinder volume service
Change-Id: I29ad8fc0e504779184fdf3795dc82ce1b031dbf8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 4 Jul 2017 11:54:11 +0000 (15:54 +0400)]
Turn on opendaylight scenario
* fix formula & reclass cluster model
* bring in running states
Change-Id: I8e66e69045f5c745f9aa6f59f7ce6d66b5bf1c95
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Thu, 29 Jun 2017 11:52:28 +0000 (15:52 +0400)]
Rewrite infra deployment scripts
* bring in scenario files
* shift infra code into functions
Change-Id: I650a26d03d842c3afcc7fcb97b84ef4826827a38
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Tue, 27 Jun 2017 08:52:39 +0000 (12:52 +0400)]
Bring in opendaylight support
Change-Id: I2eed0cf19907f257be1cb4aee96528cc41f4843a
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 28 Jun 2017 12:33:27 +0000 (16:33 +0400)]
Set salt bootstrap distrib revision
Change-Id: Id278afd05fd8793f573fce0d4ca1ff7420fc9127
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 28 Jun 2017 10:47:29 +0000 (14:47 +0400)]
Get latest salt-formulas code
Change-Id: I6284589343bfcdc4f35734d5c291ad0a2bf02d74
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Fri, 23 Jun 2017 13:44:33 +0000 (17:44 +0400)]
Remove redundant services from noha scenario
Change-Id: I445f6ac802fbf1b382b18bcb4306eb5538cb1867
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Michael Polenchuk [Wed, 21 Jun 2017 10:43:40 +0000 (14:43 +0400)]
Make virtual cluster as noha w/ one controller
* remove glusterfs from cluster
* increase amount of ram on controller
* bring in one more compute node
Change-Id: I04ccd4cdaf65bb860d6d3b9c012e035f598e44d5
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Vladimir Blokhin [Tue, 20 Jun 2017 14:36:39 +0000 (17:36 +0300)]
Correct ssh key copy options
Change-Id: Iea7a28fcd2ae59bc3ba76bffb42675dfc4bc917d
Signed-off-by: Volodymyr Blokhin <vladrulez@gmail.com>
Michael Polenchuk [Tue, 20 Jun 2017 10:21:23 +0000 (14:21 +0400)]
[mcp] Mend networks config
* create openstack/neutron external network
* set default gateway for mgmt network
Change-Id: I71c22ab6d1b8c589c1cf147aa37874600ab1cbd7
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>