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

If datacenter is specified in the config, then look for managed objects under it #30278

Merged
merged 3 commits into from Jan 13, 2016

Conversation

Projects
None yet
4 participants
@nmadhok
Member

nmadhok commented Jan 11, 2016

If datacenter is specified in the config, then look for managed objects under it instead of looking across all datacenters. Reason of this is that there may be multiple objects with the same name across datacenters such as DVS port group names.

Fixes #30264

@mstagi

This comment has been minimized.

Show comment
Hide comment
@mstagi

mstagi Jan 12, 2016

Contributor

It fails with the error:
[ERROR ] There was a profile error: For "pathSet" expected type PropertyPath, but got vim.Datacenter

Contributor

mstagi commented Jan 12, 2016

It fails with the error:
[ERROR ] There was a profile error: For "pathSet" expected type PropertyPath, but got vim.Datacenter

Show outdated Hide outdated salt/cloud/clouds/vmware.py Outdated
@nmadhok

This comment has been minimized.

Show comment
Hide comment
@nmadhok

nmadhok Jan 12, 2016

Member

@mstagi Can you give this a try again?

Member

nmadhok commented Jan 12, 2016

@mstagi Can you give this a try again?

@mstagi

This comment has been minimized.

Show comment
Hide comment
@mstagi

mstagi Jan 13, 2016

Contributor

@nmadhok Are you planning to add this change to the develop branch too or should I make the changes there?

Contributor

mstagi commented Jan 13, 2016

@nmadhok Are you planning to add this change to the develop branch too or should I make the changes there?

@nmadhok

This comment has been minimized.

Show comment
Hide comment
@nmadhok

nmadhok Jan 13, 2016

Member

@mstagi the patch will automatically be ported to develop branch

Member

nmadhok commented Jan 13, 2016

@mstagi the patch will automatically be ported to develop branch

@rallytime

This comment has been minimized.

Show comment
Hide comment
@rallytime

rallytime Jan 13, 2016

Contributor

This looks great! Thanks @nmadhok!

Contributor

rallytime commented Jan 13, 2016

This looks great! Thanks @nmadhok!

rallytime added a commit that referenced this pull request Jan 13, 2016

Merge pull request #30278 from nmadhok/2015.8-samename-objects-fix
If datacenter is specified in the config, then look for managed objects under it

@rallytime rallytime merged commit 1624d6c into saltstack:2015.8 Jan 13, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11230 — FAILURE
Details
jenkins/salt-pr-rs-ubuntu14.04-n Salt PR - RS Ubuntu 14 #8721 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12640 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12339 — SUCCESS
Details

@nmadhok nmadhok deleted the nmadhok:2015.8-samename-objects-fix branch Jan 13, 2016

@rallytime

This comment has been minimized.

Show comment
Hide comment
@rallytime

rallytime Jan 14, 2016

Contributor

@nmadhok This change caused a lot of merge conflicts in the develop branch in my merge-forward in #30369, and it was difficult to parse which changes should be kept correctly, so I just took the develop branch changes. This change will need to be made against the develop branch directly.

Contributor

rallytime commented Jan 14, 2016

@nmadhok This change caused a lot of merge conflicts in the develop branch in my merge-forward in #30369, and it was difficult to parse which changes should be kept correctly, so I just took the develop branch changes. This change will need to be made against the develop branch directly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment