Mike Place
f60f26da67
Merge pull request #27387 from adelcast/dev/adelcast/add_grains_refresh_networksettings_beacon
...
network_settings beacon: add grains refresh if network change is detected
2015-09-28 12:35:57 -06:00
Mike Place
7dcec62fcc
Merge pull request #27441 from Deewiant/issue-27401
...
states.file: allow prepending to non-existent file (#27401 )
2015-09-28 11:40:31 -06:00
Mike Place
f1f5cc653b
Merge pull request #27431 from jagguli/develop
...
Check Names kwarg is not None
2015-09-28 08:51:48 -06:00
Mike Place
1961dd2726
Merge pull request #27449 from JaseFace/fix-27391-for-develop
...
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
2015-09-28 08:51:08 -06:00
Jason Wolfe
7522954160
Ensure we pass on the enable setting if present, or use the default of True if not in build_schedule_item()
...
Prior to this, when schedule.present compares the existing schedule to the one crafted by this function, enabled will actually be removed at each run. schedule.present sees a modification needs to be made, and invokes schedule.modify, which does so with enabled: True, creating and endless loop of an 'enabled' removal and addition.
2015-09-27 12:26:37 -07:00
Matti Niemenmaa
8eb5036f1f
states.file: allow prepending to non-existent file ( #27401 )
...
Remove the redundant file.touch invocation also from file.append, to
simplify the flow.
2015-09-27 09:06:51 +03:00
Steven Joseph
3a234158ad
Check Names kwarg is not None
2015-09-26 10:18:27 +10:00
Colton Myers
01490387d7
Merge pull request #27344 from rhealitycheck/mongo-returners-patch-1
...
Mongo returners patch 1
2015-09-25 17:12:39 -06:00
Colton Myers
79fe1ac9c4
Merge pull request #27398 from flowhamster/patch-1
...
Allow cloud roster to use sudo
2015-09-25 16:47:56 -06:00
Colton Myers
4ece4b7ef6
Merge pull request #27396 from hvnsweeting/hvn-ddns
...
doc fix for ddns module, improve keyfile handling
2015-09-25 16:39:35 -06:00
Kevin King
7601355c7a
doc: added documentation to cloud roster and fixed whitespace
2015-09-25 14:05:18 -07:00
jacobhammons
24e665335d
Merge pull request #27399 from multani/fix/docs
...
Various documentation fixes
2015-09-25 09:42:52 -06:00
Jonathan Ballet
184d7aa59b
doc: fixed indentation in salt.renderers.jinja's documentation
2015-09-25 16:21:57 +02:00
Jonathan Ballet
ea47acb23b
doc: fixed indentation in salt.modules.consul's documentation
2015-09-25 16:21:46 +02:00
Jonathan Ballet
cdad7ddb3a
doc: fix etcd state documentation typos
2015-09-25 10:36:27 +02:00
Jonathan Ballet
c4e7392a2b
doc: fix state's top documentation typo
2015-09-25 10:36:27 +02:00
Jonathan Ballet
8ad1253945
doc: fix documentation formatting for state blockdev
2015-09-25 10:36:27 +02:00
Jonathan Ballet
cbfd11651f
doc: fix formatting in state boto_elb
2015-09-25 10:36:27 +02:00
Jonathan Ballet
f125d309c9
doc: fix links in Docker state documentation
2015-09-25 10:36:27 +02:00
Jonathan Ballet
a6b9cd4a05
doc: Docker state use ports and not port_bindings anymore
2015-09-25 10:36:27 +02:00
Jonathan Ballet
0b949b0929
doc: fix link to docker-py documentation
2015-09-25 10:36:27 +02:00
Jonathan Ballet
45aecdbffd
doc: fix RAET links
2015-09-25 10:36:19 +02:00
Kevin King
c8b71e053b
Allow cloud roster to use sudo
...
Similar to issue #26689 , but I am using the cloud roster file to get the IP targets generated from running salt-cloud.
2015-09-25 01:33:31 -07:00
Viet Hung Nguyen
759cd9dd19
fix key for keyring, add doc for keyalgorithm
2015-09-25 15:22:50 +07:00
Jonathan Ballet
59f0285de8
doc: fix rendering of salt.states.hipchat
2015-09-25 10:20:53 +02:00
Jonathan Ballet
79d8ff38ca
doc: fixed RST markup on Salt Cloud functions
2015-09-25 10:20:53 +02:00
Jonathan Ballet
fc8a1bc349
doc: remove duplicated Salt Cloud AWS section on Termination Protection
2015-09-25 10:20:53 +02:00
Viet Hung Nguyen
b5a45961e5
raise exception if keyfile specified but does not exist
...
help user troubleshooting easier than return None
2015-09-25 15:12:46 +07:00
Alejandro del Castillo
60f475d17c
Add grains refresh if network change is detected
...
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
2015-09-24 17:34:44 -05:00
rhealitycheck
aae8662657
Update mongo_return.py
2015-09-24 15:20:25 -05:00
rhealitycheck
977e55531b
Update mongo_return.py
2015-09-24 15:00:18 -05:00
rhealitycheck
912e567577
Update mongo_return.py
2015-09-24 12:21:09 -05:00
rhealitycheck
2614dbb39f
Update mongo_future_return.py
2015-09-24 10:24:05 -05:00
C. R. Oldham
63c3cd396f
Merge pull request #27338 from rallytime/cloud-logging-develop
...
[develop] Fixup salt-cloud logging
2015-09-24 09:02:30 -06:00
rhealitycheck
e54cd9c867
Update mongo_return.py
2015-09-24 09:57:49 -05:00
rhealitycheck
042a761213
Update mongo_future_return.py
2015-09-24 09:56:55 -05:00
Nicole Thomas
06047ebc5a
Merge pull request #27324 from alxbse/vmware-standalone-esxi
...
Adds support for creating without cloning VMs in VMware driver
2015-09-24 08:52:18 -06:00
rhealitycheck
95e388594f
Update mongo_return.py
2015-09-24 09:10:37 -05:00
rhealitycheck
8bc1f4b03a
Update mongo_future_return.py
2015-09-24 09:09:11 -05:00
C. R. Oldham
774ab9346b
Merge pull request #27362 from eliasp/states.test.mod_watch-doc_typo
...
Remove one single-quote too much in doc of 'states.test.mod_watch'.
2015-09-24 07:53:11 -06:00
C. R. Oldham
d169db44f3
Merge pull request #27357 from rallytime/dry-keychecks
...
DRY: Let's only write the code to check keypaths and modes once
2015-09-24 07:52:15 -06:00
Alexander Backlund
759c8863d1
Merge branch 'vmware-standalone-esxi' of https://github.com/alxbse/salt into vmware-standalone-esxi
...
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/vmware.py
2015-09-24 07:22:06 -04:00
Elias Probst
f33d6d80b3
Remove one single-quote too much in doc of 'states.test.mod_watch'.
2015-09-24 09:08:50 +02:00
rallytime
02fac2ff58
Pylint: Remove unused imports
2015-09-23 17:00:24 -06:00
Thomas S Hatch
ebe60c0b68
Merge pull request #27359 from thatch45/rand_swarm
...
Allow the minion swarm to generate random minion OSES
2015-09-23 17:00:15 -06:00
Thomas S Hatch
d37afd1be8
Add rand-ver option
2015-09-23 16:09:23 -06:00
Thomas S Hatch
d5c23bdf8a
Allow the minion swarm to generate random minion OSES
2015-09-23 15:59:55 -06:00
rallytime
b6cee6960d
Version added
2015-09-23 15:40:38 -06:00
rallytime
f7010cfac1
DRY: Let's only write the code to check keypaths and modes once
2015-09-23 15:36:33 -06:00
Colton Myers
71439077d8
Merge pull request #27352 from basepi/merge-forward-develop
...
Merge forward from 2015.8 to develop
2015-09-23 15:24:44 -06:00
