summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Pichon <jpichon@redhat.com>2017-06-13 09:15:00 +0100
committerJulie Pichon <jpichon@redhat.com>2017-06-13 15:09:07 +0100
commit1fdeaafa322a07a3b9d0c9bf01a4ad30f75aacdc (patch)
treebbd02dab9f024f52b1883971693cc150640085cf
parenta7f2a0a32a5339909cf3dad5762cef2c9c286c76 (diff)
Delete Mistral environment after the migration
Once the tripleo-common patch removing the last references to the Mistral environment merges, the Mistral environment can be safely deleted. Related blueprint: stop-using-mistral-env Depends-On: Ieedecf92113142e43925131dcbccc4c0cd5b1a18 Change-Id: Iad819ee27a02ff00baf85304fdd950622cbcef25
Notes
Notes (review): Code-Review+2: Juan Antonio Osorio Robles <jaosorior@redhat.com> Code-Review+1: Ana Krivokapic <akrivoka@redhat.com> Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 15 Jun 2017 21:52:50 +0000 Reviewed-on: https://review.openstack.org/473731 Project: openstack/instack-undercloud Branch: refs/heads/master
-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 937069f..1c893a4 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -1404,10 +1404,7 @@ def _migrate_plans(mistral, swift, plans):
1404 env = mistral.environments.get(plan).variables 1404 env = mistral.environments.get(plan).variables
1405 yaml_string = yaml.safe_dump(env, default_flow_style=False) 1405 yaml_string = yaml.safe_dump(env, default_flow_style=False)
1406 swift.put_object(plan, plan_env_filename, yaml_string) 1406 swift.put_object(plan, plan_env_filename, yaml_string)
1407 # TODO(jpichon): delete env from Mistral once triple-common 1407 mistral.environments.delete(plan)
1408 # change merges (https://review.openstack.org/#/c/452291/).
1409 # Right now plan operations still expect a Mistral environment.
1410 # mistral.environments.delete(plan)
1411 1408
1412 1409
1413def _create_default_plan(mistral, plans, timeout=360): 1410def _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.