28 Commits

Author SHA1 Message Date
Hironori Shiina
b0608771e5 Set nomulticell flag for starting nova-compute in grenade
This patch set nomulitcell flag when starting nova-compute because
multi-cell rabbit setup is not necessary in Grenade. This nomulticell
flag will be introduced with I08d7da843d18b426dda8a8a231039d950a4c0ce5.

Closes-Bug: 1700548
Change-Id: Ib55f6359751052d41b46e31ec8e15f46e33c1193
2017-07-06 14:38:22 +00:00
Vasyl Saienko
fdf6f89a23 [Grenade]: Do not run ir-api on primary node after upgrade
Ironic upgrade process has pre-requirement that ironic-conductors
should be upgraded before ironic-api. Grenade is launched on primary
node, where we have ir-api and ir-cond runnning. Do not start ir-api
on primary node after upgrade to avoid situation when we have new ir-api
(primary) and old ir-cond (subnode) as it is not allowed by upgrade
procedure. Instead redirect all requests destinied to ir-api on primary
node to subnode.

Depends-On: I026121121059768aa74389add7eee6e63fdb214d

Change-Id: I9e496353a1d3d6547e4881f96fb187e488cff83f
2017-04-28 13:59:07 +03:00
Vasyl Saienko
7a2f99bacc Run db_sync after upgrade
It may confuse that we running dbsync before upgrade project.
Fix dbsync position.

Change-Id: Icaee1fd1f0d4ccbdef2f391b581894c92d80b58e
2017-04-25 14:14:40 +00:00
Vasyl Saienko
716e22b712 Set env variables when all needed files are source
This patch moves 'source ..openrc admin admin' after we sourced keystone
variables.

Closes-Bug: #1684797

Change-Id: Ic3477c768373c993087d5c6a90dbd7131b4f9f50
2017-04-20 17:19:01 +00:00
Vasyl Saienko
210ec9d345 [Devstack] cleanup upgrade settings
We enable plugin and services in project-config.
Drop those duplications from devstack/upgrade/settings

Change-Id: I95d83d6b1f2914cbb0373099e128ab462fc3b492
Depends-On: Icdd89453ec3ebecd8375a5f2efd1a0d4bf6b4064
2017-03-28 22:25:49 +03:00
John L. Villalovos
0be91665b4 grenade: Only 'enable_plugin ironic' if not already in conf
To support multi-node grenade jobs we need to move enabling of the
ironic devstack plugin out of the ironic grenade settings file
devstack/upgrade/settings. But if we add enabling of the ironic devstack
plugin to project-config it will cause the gate to break as the plugin
will be enabled twice.

This checks to see if the ironic devstack plugin has already been
enabled:
  * If it has already been enabled it will not enable it again.
  * If it has not yet been enabled it will enable it.

This will allow us to update project-config to enable the ironic
devstack plugin and not break the gate.

After all the changes have landed we will propose a follow-up patch to
remove all this additonal logic and the enabling of the ironic devstack
plugin.

Change-Id: I09ed78ef918eb0359045350e89d42c6df9f3e490
2017-03-10 13:22:33 -08:00
anascko
5d22cfe1a8 Add wsgi handling to ironic-api in devstack
Adds handling of running ironic API under Apache as WSGI app to
devstack plugin.

New variable IRONIC_USE_MOD_WSGI (False by default) is added.
Another new variable IRONIC_WSGI_DIR (default is distro specific) is
also added, which specifies location for WSGI scripts.

Change-Id: I9c5ad56e1acd292ff0f9cc9b460125fc420abda5
Closes-Bug: #1513005
2017-03-09 16:55:34 +02:00
Jenkins
cdd7f5ae6a Merge "Adds network check in upgrade phase in devstack" 2017-02-10 16:33:18 +00:00
Vasyl Saienko
5efde6a7a3 Source lib/ironic in grenade settings
We set global variables in Ironic devstack plugin like
DEFAULT_IMAGE_NAME. Ensure that grenade uses them by
sourcing lib/ironic from upgrade/settings.

Set IRONIC_DEPLOY_DRIVER by default to pxe_ipmitool. As we no longer
add IRONIC_DEPLOY_DRIVER to IRONIC_ENABLED_DRIVERS and defaults are
conflicting.

Closes-Bug: #1663371

Change-Id: I462ac792ad7920beff64c15a7c005406fcfa5cce
2017-02-09 20:35:02 +00:00
anascko
ef4bd99c2f Adds network check in upgrade phase in devstack
When running grenade with multitenancy, we are able to boot instances
in the network neutron has created in its upgrade phase, and we don't
have to change that setup.

Change-Id: I1038548ad4f93788fca3e2b7dd8ed93da0ce7702
2017-02-07 11:28:46 +02:00
Vasyl Saienko
318b7638d9 Remove grenade config workaround
Starting with Idede322190d57491d4f7e18090aa8c29b5b87353 base and target
releases has the same tempest config file. This patch drops setting
fixed_network_name in target tempest.conf workaround.

Change-Id: I661ace60bf9b4817f73aaccda9c18e24adfc4e56
2016-12-16 14:25:55 +02:00
Vasyl Saienko
3cbe7202b7 Cleanup adding Ironic to cluster on upgrade case
Grenade is designed to upgrade services. We shouldn't add them during
upgrade. This patch removes case when we trying to add Ironic to cluster
on upgrade.

Change-Id: Id7159aac8c8a343e3d20561cedc4722d87d3e776
2016-12-01 13:42:16 +02:00
Vasyl Saienko
c81b385843 Do not source old/localrc twise in grenade
By sourcing localrc second time we try to enable ironic plugin
one more time witch is not allowed by [0]

This patch checks if ironic was enabled or not in base environment
without sourcing localrc.

[0] https://review.openstack.org/#/c/396794/

Change-Id: I432c243c66c0d11adcf4c6568968fbeaaf9acdcd
2016-11-30 11:35:02 +02:00
Vasyl Saienko
c1e0fece35 Fix grenade jobs
This changes up devstack code to make sure OVS does the right thing
after upgrading. After the neutron upgrade, it uses a new OVS tag for
networking, so this changes things over to the new one.

Make sure that we remove all resources that were created during
resources phase.

Set tempest fixed_network_name explicitly as it is prerequirement for
ironic, see reference.

Reference:

https://github.com/openstack/tempest/blob/039b2fe/tempest/scenario/manager.py#L1161

Change-Id: I35789602fb542bb33533211a742c3e4d265a3b91
2016-09-30 11:42:41 +00:00
John L. Villalovos
ebbffe1e73 Update comment from NOTE to TODO
A commend had been raised in the review that it should be a TODO.

Change-Id: I5fe8451d6375f6377cb1f3425e02193eb408666d
2016-06-07 07:21:27 -07:00
vsaienko
3de027ded5 Update resources subnet CIDR
During resources phase resources subnet is created with the same CIDR
as during setup. Ironic requires to have a route to this network from
control plane (ironic-conductor).
This patch creates a new network with has an unique CIDR and GATEWAY
defined by RESOURCES_FIXED_RANGE and RESOURCES_NETWORK_GATEWAY.
Default value for RESOURCES_FIXED_RANGE is 10.2.0.0/24 and
for RESOURCES_NETWORK_GATEWAY is 10.2.0.1

Change-Id: I83f9f90809bbf2e6d73c7282bbb9b2be084b6a66
Co-Authored-By: vsaienko <vsaienko@mirantis.com>
2016-06-06 15:28:09 -07:00
Clenimar Filemon
0376efac2c Remove hard-coded keystone version from setup
Commit Id229617ec5cf2820c1033fd2c34fc160a75c46d6 recently introduced a
hard-coded identity API version in the setup script. This patch switches
the /v2.0/ to /v$IDENTITY_API_VERSION/ so we can work when v2 is
disabled as well.

Change-Id: Ib6fd666930bf45170f69d5f64ccadf617899f7c7
2016-05-30 18:59:31 -03:00
Jenkins
5b4b8c21b6 Merge "Restart n-cpu after Ironic install" 2016-05-23 21:56:45 +00:00
Vasyl Saienko
19703205ae Restart n-cpu after Ironic install
Ironic install initiates apache restart, it may cause nova-compute
failed to start.
This patch restart nova-compute after Ironic install for new phase.
And ensures that keystone is responding before starting n-cpu.

Related-Bug: 1537076

Change-Id: Id229617ec5cf2820c1033fd2c34fc160a75c46d6
2016-05-23 13:19:27 -07:00
Vladyslav Drok
ac7f9cea9c Revert "Run smoke tests after upgrade"
This reverts commit cb7d8d7f4e0d06161ee6a30e22a2ebfe1d54ff14.

We will be running smoke tests anyway after upgrade, no need to do this twice.

Change-Id: I9452e0be44a038b37e2d26ffa32d5d012e9c1bad
2016-05-23 13:09:25 -07:00
Vasyl Saienko
f1d189d16a Fix start order for Ironic during upgrade
Start Ironic after upgrade to apply new version of code.

Change-Id: Ibf7f81012d9ea2bc6d8025916d984c5c7a3e46bb
2016-05-19 12:48:34 +03:00
Vasyl Saienko
cb7d8d7f4e Run smoke tests after upgrade
This commit sets TARGET_RUN_SMOKE to true.
It allows to launch smoke tests after upgrade.

Change-Id: I8abc31236a19083144677c6018b3b058c0254192
2016-05-19 12:29:15 +03:00
Vasyl Saienko
ab2b5a711c Add ironic to enabled_services
tempest is looking for project name in enabled_services to mark service as
enabled in tempest.conf [0]
This patch adds ironic to enabled_services to update value in
tempest.conf

Reference:
[0] 59ed73a3d4/lib/tempest (L500)

Co-Authored-By: John L. Villalovos <john.l.villalovos@intel.com>
Co-Authored-By: Jim Rollenhagen <jim@jimrollenhagen.com>

Change-Id: I525a3816f8b9c71d4ae97afd18c4ddbc2a1aca13
2016-05-18 16:41:14 +03:00
John L. Villalovos
ca611613a8 Fix shutdown.sh & upgrade.sh for grenade
The shutdown.sh & upgrade.sh scripts were attempting to load a file
which no longer exists. Have them load the correct file.

Change-Id: I864023880062fde0e84df81b7c7a6a17c0b09428
2016-05-17 10:37:26 -07:00
John L. Villalovos
f0beeada9d Setup for using the Grenade 'early_create' phase
* Create a 'devstack/upgrade/resources.sh' file to be used by
   Grenade.
 * Create an 'early_create' phase to call the create_ovs_tap()
   function.
 * Refactor the create_ovs_tap() function to accept an argument for
   the network to use.

Change-Id: I0efe427a7023d0336f25856c362c655c138102df
2016-05-16 12:59:42 -07:00
John L. Villalovos
3b3d711157 Enable Grenade usage as a plugin
Enable Grenade to run tests for Ironic using the plugin method.

Also provide some documentation on the fact that
openstack-infra/project-config will need to be updated for these changes
to take effect.

Change-Id: I49cf37333c55dbbdbb75737f1c7fd2ecaf983f21
2016-03-30 14:46:15 -07:00
Jim Rollenhagen
f047ea0f7e Fix bashate errors in grenade plugin
Fixes one bashate error in devstack/upgrade/upgrade.sh.

Change-Id: I347e39cd8055811d2ac22ed744b1d9e9f3ca37fa
2015-12-17 17:44:38 +00:00
Jim Rollenhagen
c0a72cf749 Add grenade plugin
This is a straight copy of the ironic code in grenade's tree to here.
This is necessary to drop ironic code from devstack and complete the
devstack plugin work, as well as just the right thing to do, and will
help us move faster on grenade work.

Note that I'm not sure if this will or will not, and it may make our
grenade jobs explode during the transition. However, our grenade jobs
don't work right now anyway, so nothing of value was lost. :)

Change-Id: I8b065c60e9e06cd7fc10749c49bdf79d878fcc12
2015-12-10 17:52:24 -08:00