This patch reverts the two commits listed below. There was a problem
with CephClusterFSID generation as it was created by the password
generation code in Mistral in Newton. However, this password generation
didn't work for upgrades as it didn't take into account upgrades and
passwords that were in use in an existing Heat stack.
This issue was resolved in I3ea6bbd0d9c5dd345b8a4a26a1788326e09d4209.
Now when a deployment plan is created, if there is an existing Heat
stack it takes the parameters from the Heat stack and uses those, rather
than regenerating. This change should also resolve the issue where the
CephClusterFSID was regenerated.
Revert "Generate CephClusterFSID for new stacks"
This reverts commit 20167e850a6bcb1fbb1bfa8cb030000600c3dc27.
Revert "Revert "Add CephClusterFSID to generated passwords""
This reverts commit ad64050485f79d2330c68b76a3f21b4c0d9a3e33.
Related-Bug: #1636555
Change-Id: I10b5613eda4bd47554a4f5e9f57218010b835fe7
(cherry picked from commit e1c07fc453e5113782fb0d22cd4a487260f68579)
Reviewed: https:/ /review. openstack. org/401267 /git.openstack. org/cgit/ openstack/ tripleo- common/ commit/ ?id=e10fd440072 91b65dd3df74cc4 c999732eac622f
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit e10fd44007291b6 5dd3df74cc4c999 732eac622f
Author: Dougal Matthews <email address hidden>
Date: Wed Nov 23 11:26:11 2016 +0000
Revert changes to CephClusterFSID generation
This patch reverts the two commits listed below. There was a problem
with CephClusterFSID generation as it was created by the password
generation code in Mistral in Newton. However, this password generation
didn't work for upgrades as it didn't take into account upgrades and
passwords that were in use in an existing Heat stack.
This issue was resolved in I3ea6bbd0d9c5dd 345b8a4a26a1788 326e09d4209.
Now when a deployment plan is created, if there is an existing Heat
stack it takes the parameters from the Heat stack and uses those, rather
than regenerating. This change should also resolve the issue where the
CephClusterFSID was regenerated.
Revert "Generate CephClusterFSID for new stacks" fbb1bfa8cb03000 0600c3dc27.
This reverts commit 20167e850a6bcb1
Revert "Revert "Add CephClusterFSID to generated passwords"" 330c68b76a3f21b 4c0d9a3e33.
This reverts commit ad64050485f79d2
Related-Bug: #1636555 7554a4f5e9f5721 8010b835fe7 782fb0d22cd4a48 7260f68579)
Change-Id: I10b5613eda4bd4
(cherry picked from commit e1c07fc453e5113