Daniel Wallace
d6eb11410f
Attempt to connect to public ip address in softlayer
...
Unless private_ssh or private_wds is set.
Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address. It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.
Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
2017-04-27 12:22:13 -06:00
Nicole Thomas
abb42d1de3
Merge pull request #40932 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-27 11:47:05 -06:00
Nicole Thomas
f0a9767a96
Merge pull request #40931 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-27 11:46:29 -06:00
Nicole Thomas
55a399583e
Merge pull request #40930 from rallytime/bp-40811
...
Back-port #40811 to 2016.3
2017-04-27 11:45:57 -06:00
Nicole Thomas
a622518ad2
Merge pull request #40929 from rallytime/bp-37696
...
Back-port #37696 to 2016.11
2017-04-27 11:43:25 -06:00
Nicole Thomas
f88ce8e4de
Merge pull request #40921 from corywright/consistent-salt-auth-headings
...
Make salt.auth.rest heading consistent with all other salt.auth documentation
2017-04-27 11:36:46 -06:00
Nicole Thomas
7bc01be859
Merge pull request #40927 from terminalmage/docs
...
Add documentation for PyYAML's loading of time expressions
2017-04-27 11:33:16 -06:00
Nicole Thomas
26be306b5c
Merge pull request #40752 from Enquier/nova_ssl_2
...
Add ability to specify a custom SSL certificate or disable SSL verification in KeystoneAuth v3
2017-04-27 11:29:08 -06:00
Nicole Thomas
7eab9c6cf4
Merge pull request #40891 from terminalmage/pip-installed
...
Fix two issues with pip.install
2017-04-27 11:24:55 -06:00
rallytime
7fb12e47d5
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-04-27 10:37:43 -06:00
rallytime
a876bcdb8a
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-27 10:37:05 -06:00
David Boucha
3ccb553f9f
get config_dir based off conf_file
...
get config_dir based off conf_file if config_dir not in __opts__
ZD 1353
2017-04-27 10:34:32 -06:00
Nicole Thomas
1a28722c5a
Pylint fix
2017-04-27 10:33:15 -06:00
yangang
8e0a9864c5
if vm state is not ACTIVE, associate floating ip to it will fail.So we should wait for state of vm is ACTIVE,then associate the assigned floating ip to it
2017-04-27 10:33:15 -06:00
Erik Johnson
8c078f144c
Add additional note about quoting within load_yaml
2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11
Add documentation for PyYAML's loading of time expressions
...
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
2017-04-27 10:59:49 -05:00
twangboy
c03f8d39d2
Use req_2.txt for Py2
2017-04-27 09:51:32 -06:00
twangboy
57d5f781f4
Use req files in pkg\windows for setup
2017-04-27 09:47:46 -06:00
Mike Swierczek
373e12622a
Add a note to the ssh_known_hosts State doc.
...
I tried to use this state with multiple
hostname aliases in a single entry, and
discovered it did not work. Hopefully this
documentation tweak will help future users.
2017-04-27 11:25:18 -04:00
Erik Johnson
6dda4f2bc3
aptpkg: fix temp pkg unhold when version is specified
...
When a version is specified, a given package's entry in the all_pkgs
list contains the version number (e.g. "name=version" instead of just
"name"). This fixes the check for which packages to unhold by creating a
separate list of targeted package names by stripping off the "=" (if
present) from each element in all_pkgs.
2017-04-27 09:10:15 -05:00
Cory Wright
2995a05c2b
Make salt.auth.rest heading consistent with all other salt.auth documentation
2017-04-27 09:32:53 -04:00
Mike Place
0f2ec1e1db
Merge pull request #40894 from senthilkumar-e/broken_jobs_api_fix
...
Fix for broken /jobs/<jid> in 2016.11.4
2017-04-27 05:32:59 -06:00
Mike Place
cb7aa0856a
Merge pull request #40910 from sjorge/mdata-relnotes
...
update oxygen release notes for grains deprecation
2017-04-27 05:08:27 -06:00
Erik Johnson
9e6361c6c8
Add GitPython HTTP git_pillar tests
2017-04-27 00:48:24 -05:00
Demo Kiosk
bff881e6d6
use clean_kwargs correctly
2017-04-27 11:38:05 +10:00
twangboy
1c3cd62594
Fix unicode support for win_system
2017-04-26 17:53:25 -06:00
Super-User
db6eadd6c3
update oxygen release notes for grains deprecation
2017-04-26 23:30:53 +02:00
Anthony Shaw
e2dc7bf141
format rst in tutorial
2017-04-27 06:32:25 +10:00
Anthony Shaw
d912ac4a6d
use standard keyword cleaning method
2017-04-27 06:27:59 +10:00
Mike Place
d93841898f
Merge pull request #40901 from ender8282/develop
...
Add support for KDE neon
2017-04-26 13:51:09 -06:00
rkgrunt
4f9c92a012
Fixed issue with parsing of master minion returns when batching is enabled.
2017-04-26 14:38:14 -04:00
Mike Place
34708956ed
Merge pull request #40892 from StreetHawkInc/develop
...
add minion function to reload beacon #35960
2017-04-26 12:10:30 -06:00
John Hubbard
6a2c320b9b
Added support for KDE neon
...
Updated _OS_MAP_NAME and _OS_FAMILY_MAP to map 'neon' into 'KDE neon' and to associate that with the Debian.
For details about KDE neon see neon.kde.org
2017-04-26 10:23:38 -07:00
CEG
817f49296e
fixing lint errors in keystone auth error
2017-04-26 11:05:53 -06:00
CEG
f683636c61
fix trailing whitespace
2017-04-26 11:05:07 -06:00
Mike Place
7a63e3cfd2
Merge pull request #40668 from grep4linux/new_xen_cloud_driver
...
new Xen cloud driver
2017-04-26 10:59:38 -06:00
Nicole Thomas
000f8f7952
Merge pull request #40875 from Absolight/fix-pkgng-upgrade
...
Remove some more raw string formatting forgotten in f4fb771
2017-04-26 10:08:17 -06:00
Nicole Thomas
c710ac8ebd
Merge pull request #40842 from hujunya/bugfix/redis_clean_old_jobs
...
fix redis returner clean_old_jobs
2017-04-26 10:05:25 -06:00
Nicole Thomas
76d6419cfd
Merge pull request #40868 from gtmanfred/develop
...
Add Zookeeper tests
2017-04-26 09:44:16 -06:00
Nicole Thomas
92003e2776
Merge pull request #40869 from gtmanfred/nitrogen
...
Backport Fix for docker.push/pull
2017-04-26 09:31:21 -06:00
Nicole Thomas
ea55c15367
Merge pull request #40876 from BenoitKnecht/fix-sqlite3-table-present-with-multiline-schema
...
states: sqlite3: fix table_present with multi-line schema
2017-04-26 09:21:18 -06:00
senthilkumar-e
2f55b26e08
Fixing the pylint issue
2017-04-26 20:51:14 +05:30
Pablo Suárez Hernández
2625229288
Pylint fixes
2017-04-26 14:42:54 +01:00
Pablo Suárez Hernández
9b241b7338
Adapting Zypper test to new list_downloaded output
2017-04-26 12:35:27 +01:00
Pablo Suarez Hernandez
49c2cc9ab6
Listing all patches instead of security ones only
2017-04-26 12:34:13 +01:00
Pablo Suarez Hernandez
ddf98e3fe3
Enhances pkg.list_downloaded information of a package
2017-04-26 12:34:13 +01:00
Anthony Shaw
f983d7e07b
enable load balancer to support extended arguments in create and destroy balancer
2017-04-26 21:10:43 +10:00
Anthony Shaw
6ee3c55c1f
lint fixes and use a list of dicts for starting members instead of a Member property list to make it service bus friendly
2017-04-26 17:46:40 +10:00
Anthony Shaw
48d2575f77
remove the integration test for dns
2017-04-26 17:02:48 +10:00
Anthony Shaw
f2800da985
return true when creating a new container
2017-04-26 16:43:04 +10:00
