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

Make sure -Q output is consistent across salt-cloud drivers #27110

Merged
merged 3 commits into from Sep 14, 2015

Conversation

rallytime
Copy link
Contributor

Fixes #11993

@rallytime rallytime added Salt-Cloud Medium Change RIoT Relates to integration with cloud providers, hypervisors, API-based services, etc. labels Sep 14, 2015
@@ -184,10 +184,36 @@ def list_nodes(call=None):
while fetch:
items = query(method='droplets', command='?page=' + str(page) + '&per_page=200')
for node in items['droplets']:
networks = node['networks']
v4s = networks.get('v4', None)
Copy link
Contributor

Choose a reason for hiding this comment

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

You do not need the second None. It is an implied default.

@cachedout
Copy link
Contributor

@rallytime A tiny bit of cleanup here and we'll be set. Thanks!

@cachedout cachedout added the pending-changes The pull request needs additional changes before it can be merged label Sep 14, 2015
@rallytime rallytime removed the pending-changes The pull request needs additional changes before it can be merged label Sep 14, 2015
cachedout pushed a commit that referenced this pull request Sep 14, 2015
Make sure -Q output is consistent across salt-cloud drivers
@cachedout cachedout merged commit 89c90df into saltstack:2015.8 Sep 14, 2015
@rallytime rallytime deleted the fix-11993 branch September 14, 2015 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
RIoT Relates to integration with cloud providers, hypervisors, API-based services, etc. Salt-Cloud
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants