Commit Graph

6 Commits

Author SHA1 Message Date
Zuul
c099f863c9 Merge "Clear up Upgrade params on converge" 2018-06-01 17:43:57 +00:00
Lukas Bezdicka
9757069cb3 Clear up Upgrade params on converge
During FFWD Upgrade or Minor Update we should still make sure
we clear Upgrade params too.

Resolves: rhbz#1558787
Closes-Bug: 1770191
Change-Id: Id1eb4c3d93ae8f36adb8ab4fa2df570a6a76951f
2018-05-14 15:08:27 +02:00
mandreou
d7ce2c8bb7 FFU Set NetworkDeploymentActions CREATE,UPDATE for ffwd-upgrade prepare
And unset back to CREATE on ffwd-upgrade converge. See [0] for more
discussion. This is to allow operators to update to the new script
based os-net-config network templates during the ffwd-upgrade.

[0] https://bugzilla.redhat.com/show_bug.cgi?id=1568561#c3
Change-Id: Ib5be49579545ad0ec7bf95e96fbe1f62ec4d3ac0
2018-05-12 12:19:58 +00:00
Jiri Stransky
4742f2ed5a Set normal CephAnsiblePlaybook on update/upgrade/ffwd converge
As we discovered bug #1768586 we'll need to make sure that every
parameter tweak in plan is followed by a stack update.

So far the Ceph upgrade command did set param -> stack update -> unset
param (only in plan). However this means the last CephAnsiblePlaybook
setting (back to normal deploy playbook) was discarded.

Let's reuse normal converge commands to converge CephAnsiblePlaybook
too, and we can remove the (now unused) ceph-upgrade-converge.yaml. We
won't do more stack updates than necessary, and at the same time the
user workflow stays somewhat consistent between envs that do and don't
have Ceph.

An alternative would be to run the as part of the Ceph command, but
that either means we'd have to run one more stack update then
necessary, or skip the last converge in envs with Ceph, and
essentially diverge further from the non-Ceph workflow.

Change-Id: If596531cbb1e750ed67e66391743f4c1833e4337
Depends-On: I025eac40f8bda5f23c789e7fef1a9e9b49947f66
Partial-Bug: #1768586
2018-05-04 11:34:23 +02:00
Jiri Stransky
19be98ba07 No-op Mistral workflow resources for update/upgrade/ffwd
So far we haven't been disabling workflows for update/upgrade. We
should disable them by default as they could have the potential to
disrupt the update/upgrade/ffwd procedure.

The main example of a thing we deploy via the workflow resources is
Ceph. We decided no-opping ceph-ansible for the main
update/upgrade/ffwd upgrade steps is the safest path forward and we'll
update/upgrade Ceph it after the main procedure is finished.


Change-Id: I34c7213ab7b70963ad2e50f7633b665fad70bde5
2018-04-23 10:47:58 +00:00
mandreou
19ed1afb2a Update environment files for Q upgrade and ffwd upgrade
This consolidates the upgrade and ffwd-upgrade related env files,
removing no longer relevant files (like converge vs converge-docker).

In line with recent/ongoing work in tripleoclient [1][2] we now have
cli: overcloud [upgrade|update|ffwd-upgrade] [prepare|run|converge]

With this patch we can also change the set/unset of resource 'noop'
and move it from tripleo-common to python-tripleoclient, like I am
pointing at in related client review below. If others agree then I
will do the same with the upgrade-prepare and also the ffwd cli
in [3], i.e. add explicit inclusion of the upgrade-prepare.yaml
and then similarly include the upgrade-converge.yaml for the
upgrade/ffwd-upgrade converge cli.

Related:
  I1288fe68ae8af02a5d77390d237ec467d88e43d2 python-tripleoclient

[1] 96ffa3a325
[2] https://review.openstack.org/#/c/558536/5/tripleoclient/v1/overcloud_update.py
[3] https://review.openstack.org/#/c/557937/4/tripleoclient/v1/overcloud_ffwd_upgrade.py@72

Change-Id: Icfe494e3219d6d6cd3251f75bb4329fc4d793c3c
2018-04-16 08:14:17 +00:00