Steven Joseph
f65bb02d73
add minion function to reload beacon #35960
2017-04-26 15:17:00 +10:00
Nicole Thomas
d14def6454
Merge pull request #40874 from tonybaloney/libcloud_load_balancer_states
...
Add Apache Libcloud Load Balancer State module
2017-04-25 16:45:40 -06:00
Nicole Thomas
8305ff66ce
Merge pull request #40885 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-25 14:12:32 -06:00
Nicole Thomas
434e8082ba
Quick lint fix for liblcoud_loadbalancer
...
Added whitespace after `:`
2017-04-25 11:32:02 -06:00
rallytime
d7831c451c
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-25 11:09:01 -06:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test
2017-04-25 21:47:38 +10:00
Anthony Shaw
74b955004b
add docs for new state modules
2017-04-25 21:32:13 +10:00
Anthony Shaw
76bdcabe1e
add commands for adding and removing members from a balancer
2017-04-25 21:28:47 +10:00
Anthony Shaw
8caf26a6a3
fixed the storage state module expecting a class instance, when I switched the responses to dictionaries
2017-04-25 21:18:17 +10:00
Anthony Shaw
3a15b9d4c2
add basic state module for load balancers
2017-04-25 21:15:50 +10:00
Anthony Shaw
867e6c1ce5
tests for load balancer and lint for other modules, fixes for load balancer
2017-04-25 21:07:27 +10:00
Anthony Shaw
5f03b7a506
tests for load balancer and fixed issue with destroy balancer
2017-04-25 20:44:36 +10:00
Anthony Shaw
bb4ec6c4db
tests for the storage module
2017-04-25 20:27:52 +10:00
Anthony Shaw
27b8849ede
add existing libcloud modules to doc index
2017-04-25 17:17:18 +10:00
Mike Place
25a438a4e1
Merge pull request #40750 from pcn/add-aws-detailed-monitoring-toggle
...
Add aws detailed monitoring toggle
2017-04-24 22:41:20 -06:00
Mike Place
5d9dd3ad56
Merge pull request #40805 from terminalmage/moby
...
Alias moby to docker in Nitrogen (and later)
2017-04-24 22:37:53 -06:00
Mike Place
d5c781b40b
Merge pull request #40858 from rallytime/locale-fixes
...
Use locale_search_str variable in locale.gen_locale and add error handling to integration test
2017-04-24 22:32:48 -06:00
Mike Place
8a7f7af5d8
Merge pull request #40863 from BenoitKnecht/support-systemd-on-cumulus-linux
...
modules: service: support Systemd on Cumulus Linux
2017-04-24 22:25:55 -06:00
Nicole Thomas
eb8fd68154
Merge pull request #40844 from tonybaloney/libcloud_storage
...
Added execution and state modules for Apache Libcloud
2017-04-24 17:10:33 -06:00
Nicole Thomas
506e8f7fbc
Merge pull request #40847 from tonybaloney/libcloud_load_balancer
...
Add execution module for Apache Libcloud load balancer API
2017-04-24 17:09:36 -06:00
Nicole Thomas
6576175ff1
Merge pull request #40867 from rallytime/merge-develop
...
[develop] Merge forward from nitrogen to develop
2017-04-24 17:07:22 -06:00
rallytime
a1f9ae67e1
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-24 15:37:09 -06:00
Anthony Shaw
697dce824d
Merge branch 'libcloud_load_balancer' of github.com:tonybaloney/salt into libcloud_load_balancer
2017-04-25 07:30:51 +10:00
Anthony Shaw
2a6b3bd374
Merge branch 'develop' into libcloud_load_balancer
2017-04-25 07:29:15 +10:00
Anthony Shaw
267143686b
lint fixes and merged develop
2017-04-25 07:27:51 +10:00
Anthony Shaw
2ec6da0383
Merge branch 'develop' into libcloud_storage
2017-04-25 07:25:57 +10:00
rallytime
46684f6f69
Typo: locale should be "locale_info" dictionary
2017-04-24 15:22:25 -06:00
rallytime
44623863fa
Clean up integration test checks to be more encompassing
2017-04-24 15:12:20 -06:00
rallytime
5d8878dfdc
Remove "is not None" checks salt.utils.which if statements
...
These checks are extraneous as salt.utils.which either returns
a path or "None".
2017-04-24 14:59:48 -06:00
Benoît Knecht
a492bd4ac2
modules: service: support Systemd on Cumulus Linux
...
Cumulus Linux is Debian-based and uses Systemd as its init system.
This commit prevents the minion from trying to use SysVinit on Cumulus Linux
and failing with `ERROR: Unable to run command [...] No such file or
directory`.
2017-04-24 22:13:00 +02:00
rallytime
3dc93be6f6
Skip test if no charmaps are found
...
The "loacle -m" command might not return an error, but it might
just be empty. Let's not fail on a test that we're already logging
to the user.
2017-04-24 12:38:49 -06:00
rallytime
7efebc9f78
Remove assertion against an empty string
...
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c
Skip gen_locale test if charmaps aren't available on the test machine
...
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
2017-04-24 12:17:29 -06:00
rallytime
532cefe62e
localemod.gen_locale add locale_search_str var to reduce confusion
...
Add some spacing for easier readability
2017-04-24 12:15:43 -06:00
Peter C. Norton
b27ce61e4c
Fix 1 line and 3 lines between functions
...
Fixes pylint complaints from jenkins:
17:29:08 salt/cloud/clouds/ec2.py:3740: [E8302(expected-2-blank-lines-found-0), ] PEP8 E302: expected 2 blank lines, found 0
17:29:08 salt/cloud/clouds/ec2.py:3768: [E8303(too-many-blank-lines-3), ] PEP8 E303: too many blank lines (3)
2017-04-24 14:15:29 -04:00
Nicole Thomas
dac9e7c7f2
Merge pull request #40856 from Ch3LL/11.4_release_develop
...
[develop] Bump latest release version to 2016.11.4
2017-04-24 11:38:12 -06:00
Ch3LL
b20d878266
[develop] Bump latest release version to 2016.11.3
2017-04-24 13:31:53 -04:00
Peter C. Norton
d7ec4f7166
Committing an empty line to re-run CI
2017-04-24 13:05:55 -04:00
Nicole Thomas
2e65735bbf
Merge pull request #40853 from rallytime/lint-develop
...
Lint fixes for keystone state and keystone state unit tests
2017-04-24 10:30:11 -06:00
rallytime
ce13658301
Lint fixes for keystone state and keystone state unit tests
2017-04-24 09:27:52 -06:00
Mike Place
3cd871a31e
Remove whitespace for lint
2017-04-24 08:26:37 -06:00
Anthony Shaw
c25219a442
fixes and linting
2017-04-24 21:44:45 +10:00
Anthony Shaw
025560cbae
completed API method implementation
2017-04-24 20:46:27 +10:00
Anthony Shaw
15ad84d254
added missing brackets
2017-04-24 20:29:07 +10:00
Anthony Shaw
c4a3ccd58c
finished API for module
2017-04-24 20:25:54 +10:00
Anthony Shaw
d32e301da7
initial module for loadbalancer drivers
2017-04-24 20:09:31 +10:00
Anthony Shaw
39c094487d
add a doc page for the state module
2017-04-24 19:17:39 +10:00
Anthony Shaw
55c6ebe01a
Merge branch 'libcloud_storage_state' into libcloud_storage
2017-04-24 19:14:47 +10:00
Anthony Shaw
33ede5808b
salt state module for storage API
2017-04-24 19:14:01 +10:00
Anthony Shaw
255357654b
removed unneeded arg
2017-04-24 19:03:44 +10:00
