nova: Sync z/VM code with stable/3.0 in order to sync schema migrations#17
Open
vuntz wants to merge 4 commits intosap-oc:stable/sap/3.0from
Open
nova: Sync z/VM code with stable/3.0 in order to sync schema migrations#17vuntz wants to merge 4 commits intosap-oc:stable/sap/3.0from
vuntz wants to merge 4 commits intosap-oc:stable/sap/3.0from
Conversation
We change the default for zvm_config_drive_inject_password to true which causes the root password to be set to a randomly generated individual password rather than the hardcoded root-pass. In case this is undesired this parameter is made configurable so you can change it back to a globally hardcoded password (that is now also configurable) instead. (cherry picked from commit 6b4111c) (cherry picked from commit c410e40)
xCAT needs to be able to ssh to the compute nodes. Allow to use something different then the admin network by setting the nova.zvm.zvm_xcat_network to the name of the network that is defined in the network barclamp. z/VM will then allocate an IP in that network and set "my_ip" in nova.conf accordingly. https://bugzilla.suse.com/show_bug.cgi?id=976778 (cherry picked from commit d2de18f) (cherry picked from commit f2f1127)
Some empty lines were added, causing restart of nova services.
Author
|
For the record, once these migrations are in, I can do the cherry-pick to fix #2 |
mkoderer
approved these changes
Feb 27, 2017
| "crowbar-revision": 0, | ||
| "crowbar-applied": false, | ||
| "schema-revision": 43, | ||
| "schema-revision": 45, |
Author
There was a problem hiding this comment.
One commit moves to 44, and the next one to 45. We try to do revision bumps in an atomic way in terms of commits, so that any checkout would work.
rsalevsky
approved these changes
Feb 27, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
While z/VM isn't of real interest here, we want to keep in sync the schema migrations as it makes backporting/forward-porting schema changes much easier.
An alternative is to simply cherry-pick the schema migrations and ignore cookbook changes -- that's of course safer, but means diverging a bit more.