Look for resources in the same region as the selected template during provisioning. #13045
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
gmcculloug
reviewed
Dec 7, 2016
| @@ -1328,8 +1328,12 @@ def get_pxe_server | |||
| PxeServer.find_by(:id => get_value(@values[:pxe_server_id])) | |||
| end | |||
|
|
|||
| def get_template | |||
There was a problem hiding this comment.
Use the get_source_vm method instead. Note that in the case of service catalog items this can return a nil value.
There was a problem hiding this comment.
get_source_vm returns result in MiqHashStruct instead of AR Object.
There was a problem hiding this comment.
Use load_ar_obj to convert MiqHashStruct or AR.
bdunne
requested changes
Dec 7, 2016
| :id => other_region_id, | ||
| :pxe_image_type => pxe_image_type) | ||
|
|
||
| allow(workflow).to receive(:supports_native_clone?).and_return(true) |
| :pxe_image_type => pxe_image_type) | ||
|
|
||
| allow(workflow).to receive(:supports_native_clone?).and_return(true) | ||
| expect(workflow.allowed_customization_templates.size).to eq(1) |
There was a problem hiding this comment.
I think it would be better for this to match_array to verify that we end up with the correct template.
| @@ -1328,8 +1328,12 @@ def get_pxe_server | |||
| PxeServer.find_by(:id => get_value(@values[:pxe_server_id])) | |||
| end | |||
|
|
|||
| def get_template | |||
There was a problem hiding this comment.
Can we call this source? In the subclasses it is not always a VmOrTemplate
| @@ -1328,8 +1328,12 @@ def get_pxe_server | |||
| PxeServer.find_by(:id => get_value(@values[:pxe_server_id])) | |||
| end | |||
|
|
|||
| def get_template | |||
| VmOrTemplate.find_by(:id => get_value(@values[:src_vm_id])) | |||
There was a problem hiding this comment.
Should this be hard coded to VmOrTemplate?
lfu
force-pushed
the
in_region_1400991
branch
4 times, most recently
from
e887bbc to
57c3155
Compare
lfu
force-pushed
the
in_region_1400991
branch
2 times, most recently
from
ebd8e78 to
4b045b1
Compare
…on during provisioning. Only check for resources in the same region where the selected template locates. https://bugzilla.redhat.com/show_bug.cgi?id=1400991
lfu
force-pushed
the
in_region_1400991
branch
from
4b045b1 to
6c9058a
Compare
|
Checked commit lfu@6c9058a with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 |
bdunne
approved these changes
Dec 13, 2016
|
@gmcculloug Can this PR be merged? |
imtayadeway
added a commit
to imtayadeway/manageiq
that referenced
this pull request
Jan 18, 2017
Changes brought about in ManageIQ#13045 prevented this value from populating in the way expected. It appears that in order for the provision workflow to populate this value now, it must find the source vm/template, which needs to be supplied in the options when you create the provision request.
imtayadeway
added a commit
to imtayadeway/manageiq
that referenced
this pull request
Jan 18, 2017
With the merging of ManageIQ#13045, this spec was failing because the provision workflow failed to find the source. Adding the id to the options when creating the provision request appears to fix it.
simaishi
pushed a commit
that referenced
this pull request
Jan 19, 2017
Look for resources in the same region as the selected template during provisioning. (cherry picked from commit a25bb6c) https://bugzilla.redhat.com/show_bug.cgi?id=1414886
|
Euwe backport details: |
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.
Check tags, Pxe server and cloud init customization templates in the same region as the template.
Links
https://bugzilla.redhat.com/show_bug.cgi?id=1400991
Steps for Testing/QA
Central admin should be enabled for the two remote regions.
Don't create anything in the global region which should be just the replication of remotes.
cc @gmcculloug @bdunne