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

Fixed a bug in the consul.py module that was preventing services #34051

Merged
merged 1 commit into from Jun 16, 2016
Merged

Fixed a bug in the consul.py module that was preventing services #34051

merged 1 commit into from Jun 16, 2016

Conversation

tegbert
Copy link
Contributor

@tegbert tegbert commented Jun 15, 2016

What does this PR do?

Fixes a bug in consul.py module that was preventing services from registering in consul.agent_service_register.

What issues does this PR fix or reference?

Fixes a bug in consul.py module that was preventing services from registering in consul.agent_service_register.

Previous Behavior

A nonexistent dict key was being referenced, causing an Excepetion and failure to register the service. This fix required only changing the offending line to use the "get" method and supplying a default value.

New Behavior

Services are now able to register with consul.

Tests written?

No

from registering in consul.agent_service_register. A nonexistent
dict key was being referenced, causing an Excpetion and failure to
register the service. This fix required only changing the offending
line to use the "get" method and supplying a default value.
@rallytime rallytime merged commit bca4371 into saltstack:2015.8 Jun 16, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 19, 2016
* upstream/develop: (67 commits)
  Change 'Suse' to 'SUSE' in inspect_collector_test
  Add a test to check for disconnected minion messaging
  Fixes doc refresh bug on chrome mobile.
  Fixed a bug in the consul.py module that was preventing services (saltstack#34051)
  Back-port saltstack#34026 to 2016.3 (saltstack#34050)
  Ensure only one fileserver update in a masterless run
  Updated latest release version
  Always make changes to minion config if set (saltstack#34020)
  More YAML indentation fixes in state module examples (saltstack#34030)
  Warn when custom returners don't have minions kwarg in save_load
  Add note to release notes about returner minions kwarg change
  Fix loop over cache in auth checking!
  Save an entire minion cache traversal on each master pub
  Do not cache remote files if they are already cached
  Warn when custom returners don't have minions kwarg in save_load
  Add note to release notes about returner minions kwarg change
  Fix loop over cache in auth checking!
  Save an entire minion cache traversal on each master pub
  states.file: fix indentation in YAML examples (saltstack#34003)
  Lint fix for saltstack#34000 (saltstack#34005)
  ...
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.

None yet

2 participants