Browse Source

Merge "Delete Mistral environment after the migration"

Jenkins 1 year ago
parent
commit
d802d70d01

+ 1
- 4
instack_undercloud/undercloud.py View File

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

+ 9
- 0
releasenotes/notes/stop-using-mistral-env-41e6d19d999791dd.yaml View File

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

Loading…
Cancel
Save