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

a small, and unfortunate error #36643

Merged
merged 1 commit into from
Sep 28, 2016
Merged

Conversation

jamesloosli
Copy link
Contributor

@jamesloosli jamesloosli commented Sep 28, 2016

What does this PR do?

This corrects a dumb argument naming error that was keeping elasticsearch index creation states from working.

What issues does this PR fix or reference?

#36642

Previous Behavior

----------
          ID: elasticsearch_index_some_index_name
    Function: elasticsearch_index.present
        Name: appointment
      Result: False
     Comment: An exception occurred in this state: Traceback (most recent call last):
                File "/usr/lib/python2.7/site-packages/salt/state.py", line 1723, in call
                  **cdata['kwargs'])
                File "/usr/lib/python2.7/site-packages/salt/loader.py", line 1650, in wrapper
                  return f(*args, **kwargs)
                File "/usr/lib/python2.7/site-packages/salt/states/elasticsearch_index.py", line 53, in present
                  index_exists = __salt__['elasticsearch.index_exists'](name=name)
              TypeError: index_exists() got an unexpected keyword argument 'name'
     Started: 23:58:37.170851
    Duration: 1.342 ms
     Changes:

New Behavior

----------
          ID: elasticsearch_index_some_index_name
    Function: elasticsearch_index.present
        Name: some_index_name
      Result: True
     Comment: Index some_index_name is already present
     Started: 15:41:33.948572
    Duration: 2.834 ms
     Changes:

Tests written?

No.

@rallytime
Copy link
Contributor

Thanks @roosri!

@rallytime rallytime merged commit a4c42e0 into saltstack:develop Sep 28, 2016
@rallytime rallytime added the bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch label Sep 28, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Sep 29, 2016
* upstream/develop:
  Role is a list, fixes saltstack#36063
  a small, and unfortunate error (saltstack#36643)
  Pass the pillar proxy dictionary to pyez
  Add Thin/Min extra-mods options to the Salt SSH CLI
  Add documentation about thin-min configuration
  Add a description of the thin/min parameters to the master config
  Get the thin Salt with configured extra modules on SSH
  Generate min with configured extra modules
  Generate thin with configured extrta modules
  Add thin/min options to the master config
  Add a kwarg to let people switch on templating for Junos config files
@rallytime rallytime added ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Sep 30, 2016
cachedout pushed a commit that referenced this pull request Oct 1, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants