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

Support using private IPs (without pubic IPs) #34187

Merged
merged 2 commits into from
Jun 22, 2016

Conversation

techhat
Copy link
Contributor

@techhat techhat commented Jun 21, 2016

What does this PR do?

Support spinning up VMs that only have private IP addresses, and not public.

What issues does this PR fix or reference?

None.

Previous Behavior

Trying to spin up a machine without a public IP would fail, as sufficient configuration was not available for it.

Tests written?

No.

@rallytime rallytime merged commit 24ca086 into saltstack:develop Jun 22, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Jun 22, 2016
* upstream/develop: (25 commits)
  Support using private IPs (without pubic IPs) (saltstack#34187)
  Add 'delete' key event to list (saltstack#34189)
  Don't return bytes if py3 in salt-cloud (saltstack#34105)
  Raise the correct exception when gitfs lockfile is empty
  Remove unnecesssary comment
  Fix diskusage beacon
  fix salt --summary to count not responding minions correctly (saltstack#34165)
  doc: add missing dot (saltstack#34175)
  Typo fix (saltstack#34174)
  Update docs to match log_level warning default
  Fix YAML indentation in Apache state docstrings (saltstack#34166)
  Add integration tests for grains.append
  Moved imports to top, out of _get_moto_version function
  Updated version check. Moved check into it's own function
  Move log message from INFO to DEBUG.
  Updated test to work with new moto version. Changed strings to unicode
  Update package dep note to systemd-python for RHEL7 install
  _active_mounts_openbsd: unbreak output for special filesystems
  Make docker.absent honor test=true
  When specifying the SSH identity to use with Git as a salt URL, eg. salt://files/identity, if that file exists outside of the default base environment the file won't be accessible so we need to include the saltenv.
  ...

# Conflicts:
#	salt/states/git.py
@techhat techhat deleted the privateazure branch June 22, 2016 15:59
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