summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 21:52:50 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 21:52:50 +0000
commitd802d70d0195f78145ab7ea6806c1959cc31b4ff (patch)
treecb3024cc1b2103c19287275992ac61177310633a
parent8d49ccb2bdb86347d72ed1f4aaf5e4da15b6753f (diff)
parent1fdeaafa322a07a3b9d0c9bf01a4ad30f75aacdc (diff)
Merge "Delete Mistral environment after the migration"
-rw-r--r--instack_undercloud/undercloud.py5
-rw-r--r--releasenotes/notes/stop-using-mistral-env-41e6d19d999791dd.yaml9
2 files changed, 10 insertions, 4 deletions
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 808968b..92e5144 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -1410,10 +1410,7 @@ def _migrate_plans(mistral, swift, plans):
1410 env = mistral.environments.get(plan).variables 1410 env = mistral.environments.get(plan).variables
1411 yaml_string = yaml.safe_dump(env, default_flow_style=False) 1411 yaml_string = yaml.safe_dump(env, default_flow_style=False)
1412 swift.put_object(plan, plan_env_filename, yaml_string) 1412 swift.put_object(plan, plan_env_filename, yaml_string)
1413 # TODO(jpichon): delete env from Mistral once triple-common 1413 mistral.environments.delete(plan)
1414 # change merges (https://review.openstack.org/#/c/452291/).
1415 # Right now plan operations still expect a Mistral environment.
1416 # mistral.environments.delete(plan)
1417 1414
1418 1415
1419def _create_default_plan(mistral, plans, timeout=360): 1416def _create_default_plan(mistral, plans, timeout=360):
diff --git a/releasenotes/notes/stop-using-mistral-env-41e6d19d999791dd.yaml b/releasenotes/notes/stop-using-mistral-env-41e6d19d999791dd.yaml
new file mode 100644
index 0000000..9cce8c2
--- /dev/null
+++ b/releasenotes/notes/stop-using-mistral-env-41e6d19d999791dd.yaml
@@ -0,0 +1,9 @@
1---
2upgrade:
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.