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

Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack #6259

Merged
merged 1 commit into from
Apr 1, 2015

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Apr 1, 2015

This variable can be entirely derived from grains.cloud, and it
simplifies the configuration somewhat. (Or someone convince me I'm
wrong. I'm happy to be wrong here.)

@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 1, 2015

cc @derekwaynecarr @erictune

@vmarmol
Copy link
Contributor

vmarmol commented Apr 1, 2015

Assigning to @derekwaynecarr, feel free to reassign.

{% set cloud_provider = "--cloud_provider=" + grains.cloud -%}

{% if grains.cloud == 'aws' -%}
{% set cloud_config = "--cloud_config=/etc/aws.conf" -%}
Copy link
Member

Choose a reason for hiding this comment

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

line 38 rewrites cloud config to empty string...

you need to move that line above this line so it has an initially empty value and is not reset later in file.

Copy link
Member Author

Choose a reason for hiding this comment

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

Gah, good catch.

…SaltStack

This variable can be entirely derived from grains.cloud, and it
simplifies the configuration somewhat. (Or someone convince me I'm
wrong. I'm happy to be wrong here.)
@zmerlynn
Copy link
Member Author

zmerlynn commented Apr 1, 2015

Fixed. PTAL.

@derekwaynecarr
Copy link
Member

LGTM

derekwaynecarr added a commit that referenced this pull request Apr 1, 2015
Eliminate grains.cloud_provider (in preference to grains.cloud) from SaltStack
@derekwaynecarr derekwaynecarr merged commit 2af9b54 into kubernetes:master Apr 1, 2015
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.

4 participants