(POOLER-83) Add ability to specify a datacenter for vsphere #223
Conversation
This file contains 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
glennsarti
force-pushed
the
pooler-83-specify-datacenter
branch
4 times, most recently
from
69a5b6b to
55d286f
Compare
|
Code has been completed. Just pending an actual test on vsphere infrastructure to make sure it all works. |
glennsarti
changed the title
|
Verified manually, against a real vSphere instance, that the datacenter setting is being used:
:vsphere:
...
datacenter: 'pdx'
... |
glennsarti
changed the title
|
This PR is ready for merge |
sbeaulie
reviewed
Jun 20, 2017
| @@ -422,8 +434,9 @@ def add_disk(vm, size, datastore, connection) | |||
| true | |||
| end | |||
|
|
|||
| def find_datastore(datastorename, connection) | |||
| datacenter = connection.serviceInstance.find_datacenter | |||
There was a problem hiding this comment.
Would this one need changed too?
https://github.com/glennsarti/vmpooler/blob/55d286f8bb3b60c9798546b231096ea6d0005854/lib/vmpooler/providers/vsphere.rb#L427
There was a problem hiding this comment.
Yes you're right. I'm concerned the specs didn't pick that up.
There was a problem hiding this comment.
Updated. And modified the specs to fail if it regresses
sbeaulie
approved these changes
Jun 20, 2017
glennsarti
force-pushed
the
pooler-83-specify-datacenter
branch
from
0a775f0 to
e580faf
Compare
|
Looks like this needs a rebase |
|
There's always something :-) |
glennsarti
force-pushed
the
pooler-83-specify-datacenter
branch
from
e580faf to
42b8bbc
Compare
Previously the vsphere provider assumed that there was one and only one datacenter (DC) in the vsphere instance. However this is simply not true for many vSphere installations. This commit: - Adds the ability to define a vSphere datacenter at the Pool or Provider level whereby the Pool setting takes precedence - If no datacenter is specified the default behaviour of picking the first DC in the vSphere instance - Updated all tests for the new setting - Update the vmpooler configuration file example with relevant setting name and expected behaviour - Fixed a bug in the rvmomi_helper whereby if no DC was found it would return all DCs. This is opposite behaviour of the real RBVMOMI library as it returns nil
Specifically that the 3rd argument datacentername supports a 'nil' value, in which case the first datacenter is returned.
glennsarti
force-pushed
the
pooler-83-specify-datacenter
branch
from
42b8bbc to
5355d1c
Compare
|
Rebased. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR builds on PR #224
Previously the vsphere provider assumed that there was one and only one
datacenter (DC) in the vsphere instance. However this is simply not true for
many vSphere installations. This commit:
whereby the Pool setting takes precedence
in the vSphere instance
and expected behaviour
all DCs. This is opposite behaviour of the real RBVMOMI library as it returns
nil