Merge "Delete Mistral environment after the migration"

This commit is contained in:
Jenkins 2017-06-15 21:52:50 +00:00 committed by Gerrit Code Review
commit d802d70d01
2 changed files with 10 additions and 4 deletions

View File

@ -1410,10 +1410,7 @@ def _migrate_plans(mistral, swift, plans):
env = mistral.environments.get(plan).variables
yaml_string = yaml.safe_dump(env, default_flow_style=False)
swift.put_object(plan, plan_env_filename, yaml_string)
# TODO(jpichon): delete env from Mistral once triple-common
# change merges (https://review.openstack.org/#/c/452291/).
# Right now plan operations still expect a Mistral environment.
# mistral.environments.delete(plan)
mistral.environments.delete(plan)
def _create_default_plan(mistral, plans, timeout=360):

View File

@ -0,0 +1,9 @@
---
upgrade:
- |
The environment configuration for deployments is now stored in a
file called ``plan-environment.yaml`` that is stored in Swift
together with the templates. Mistral is no longer used to store
this data. ``openstack undercloud upgrade`` handles the migration
of existing plans automatically, including the deletion of the
Mistral environment.