Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

nova: Sync z/VM code with stable/3.0 in order to sync schema migrations #17

Open
wants to merge 4 commits into
base: stable/sap/3.0
Choose a base branch
from

Conversation

vuntz
Copy link

@vuntz vuntz commented Feb 27, 2017

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.

dirkmueller and others added 4 commits February 27, 2017 10:58
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)
(cherry picked from commit 591b062)
(cherry picked from commit 1993cd7)
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.
@vuntz
Copy link
Author

vuntz commented Feb 27, 2017

For the record, once these migrations are in, I can do the cherry-pick to fix #2

Copy link

@mkoderer mkoderer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything problematic..

@@ -93,7 +97,7 @@
"nova": {
"crowbar-revision": 0,
"crowbar-applied": false,
"schema-revision": 43,
"schema-revision": 45,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 45? and not 44?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 rsalevsky changed the base branch from staging to stable/sap/3.0 March 9, 2017 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants