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

Move _option(value) calls to __salt__['config.option'] in boto utils #30158

Merged
merged 1 commit into from Jan 6, 2016

Conversation

Projects
None yet
5 participants
@rallytime
Contributor

rallytime commented Jan 5, 2016

Removed the _option function and replaced it with __salt__['config.option'] - the former isn't a complete offering of finding pillar lookups.

Refs #29905

Move _option(value) calls to __salt__['config.option'] in boto utils
Removed the _option function - this isn't a complete offering of finding
pillar lookups.

Refs #29905
@cachedout

This comment has been minimized.

Show comment
Hide comment
@cachedout

cachedout Jan 5, 2016

Contributor

Go Go Jenkins!

Contributor

cachedout commented Jan 5, 2016

Go Go Jenkins!

@ryan-lane

This comment has been minimized.

Show comment
Hide comment
@ryan-lane

ryan-lane Jan 5, 2016

Contributor

looks good!

Contributor

ryan-lane commented Jan 5, 2016

looks good!

basepi added a commit that referenced this pull request Jan 6, 2016

Merge pull request #30158 from rallytime/fix-29905
Move _option(value) calls to __salt__['config.option'] in boto utils

@basepi basepi merged commit e36e8e2 into saltstack:2015.8 Jan 6, 2016

2 of 5 checks passed

default Merged build finished.
Details
jenkins/salt-pr-linode-ubuntu14.04-n Salt PR - Linode Ubuntu 14.04 #3948 — FAILURE
Details
jenkins/salt-pr-rs-cent7-n Salt PR - RS CentOS 7 #11092 — FAILURE
Details
jenkins/salt-pr-clone Salt PR - Clone Repository #12505 — SUCCESS
Details
jenkins/salt-pr-lint-n Salt PR - Code Lint #12204 — SUCCESS
Details

@rallytime rallytime deleted the rallytime:fix-29905 branch Jan 6, 2016

@gladiatr72

This comment has been minimized.

Show comment
Hide comment
@gladiatr72

gladiatr72 Apr 18, 2016

Contributor

Just a heads-up: config.option/merge is (also) suffering from incomplete pillar support:

I'm thinking it should take a nested option (ie: cloud.profile.<profilename>), value = re.sub(r'\.', ':', value) before processing it through pillar.get() or if trying to dodge the setup for such a call, running it through the pillar dict lookup mechanism before calling it a day.

Contributor

gladiatr72 commented Apr 18, 2016

Just a heads-up: config.option/merge is (also) suffering from incomplete pillar support:

I'm thinking it should take a nested option (ie: cloud.profile.<profilename>), value = re.sub(r'\.', ':', value) before processing it through pillar.get() or if trying to dodge the setup for such a call, running it through the pillar dict lookup mechanism before calling it a day.

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