Only create the Mistral config env if it doesn't exist
From I71edae4a4dee2204edf32e3b2800f075d221b856 we started to create a
Mistral env in instack-undercloud. This happens at install time. We
failed to only do this if the environment doesn't exist, at the moment
instack will fail on a second undercloud install as Mistral will attempt
to create the environment again and raise an exception.
This patch also fixes a regression introduced by
I71edae4a4dee2204edf32e3b2800f075d221b856 which created the config
env *after* creating the default plan - given the default plan creation
depends on the environment, this was an error.
Closes-Bug: #1633450
Change-Id: I186217fd0e1125519149763e610d3efdff583388
(cherry picked from commit a370e16be69a1d4a72038f26eb58f33a40120f48)
Reviewed: https:/ /review. openstack. org/387832 /git.openstack. org/cgit/ openstack/ instack- undercloud/ commit/ ?id=5dcc3c0fb5e 926cc040ac5cac4 a629509fe03d00
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 5dcc3c0fb5e926c c040ac5cac4a629 509fe03d00
Author: Dougal Matthews <email address hidden>
Date: Fri Oct 14 13:08:56 2016 +0100
Only create the Mistral config env if it doesn't exist
From I71edae4a4dee22 04edf32e3b2800f 075d221b856 we started to create a
Mistral env in instack-undercloud. This happens at install time. We
failed to only do this if the environment doesn't exist, at the moment
instack will fail on a second undercloud install as Mistral will attempt
to create the environment again and raise an exception.
This patch also fixes a regression introduced by ee2204edf32e3b2 800f075d221b856 which created the config
I71edae4a4d
env *after* creating the default plan - given the default plan creation
depends on the environment, this was an error.
Closes-Bug: #1633450 519149763e610d3 efdff583388 a72038f26eb58f3 3a40120f48)
Change-Id: I186217fd0e1125
(cherry picked from commit a370e16be69a1d4