rallytime
b93e35dd06
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- salt/engines/docker_events.py
2017-05-03 10:00:24 -06:00
Mike Place
044e0b2063
Merge pull request #40860 from twangboy/change_broadcast
...
Remove dependency on win32gui
2017-05-02 10:45:51 -06:00
Erik Johnson
26d2f4a52a
Do not automatically unmask services to start/restart/etc. them
2017-05-01 16:01:35 -05:00
Mike Place
9d12a614b7
Fix failing test
2017-05-01 11:50:39 -06:00
Anthony Shaw
77cdd3c2dc
backward compatibility with older versions of libcloud where snapshots don't have a name field
2017-05-01 21:05:33 +10:00
Anthony Shaw
e85f1a4314
snapshot name seems to be a recent addition
2017-05-01 14:28:54 +10:00
Anthony Shaw
7ec1d6ba83
lint fixes
2017-04-30 21:49:54 +10:00
Anthony Shaw
1c4a03c538
key pair management methods and tests, linting
2017-04-30 20:28:20 +10:00
Anthony Shaw
06e94dcb58
add image management methods and tests
2017-04-30 19:49:54 +10:00
Anthony Shaw
277933e8d8
add volume, list_images, snapshot methods and tests
2017-04-30 15:04:50 +10:00
Anthony Shaw
3f8827f6b4
add list_volumes
2017-04-29 15:54:59 +10:00
Anthony Shaw
ec95304153
destroy and reboot node
2017-04-29 15:45:07 +10:00
Anthony Shaw
cc40734255
implement list_locations
2017-04-29 15:33:20 +10:00
Anthony Shaw
3c6f13699b
unit tests for list_nodes and list_sizes with implementation
2017-04-29 15:24:15 +10:00
rallytime
f875ee3309
Merge branch 'nitrogen' into 'develop'
...
Conflicts:
- tests/integration/runners/test_runner_returns.py
2017-04-28 09:26:26 -06:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3
2017-04-28 13:36:45 +01:00
Pedro Algarvio
abe608d739
Drop @patch
usage
2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6
2017-04-28 13:33:37 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly.
2017-04-28 13:33:35 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp
not on the module level @skipIf
decorator
2017-04-28 13:33:34 +01:00
Mike Place
78011f8740
Merge pull request #40761 from meaksh/develop-pkg-minor-fixes
...
Minor fixes on new pkg.list_downloaded
2017-04-28 06:32:48 -06:00
twangboy
e8d440b543
Mock win32api instead of win32gui
2017-04-26 12:41:13 -06: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
ddf98e3fe3
Enhances pkg.list_downloaded information of a package
2017-04-26 12:34:13 +01:00
twangboy
fa8f9b55d8
Fix unit test, still mocking SendMessageTimout
2017-04-25 10:13:55 -06:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test
2017-04-25 21:47:38 +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
2b4d84ef3f
add a unit test to check the module starts correctly
2017-04-24 16:35:16 +10:00
Mike Place
6da806d1cc
Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion
...
Fix endpoint handling per region
2017-04-23 04:00:00 -06:00
rallytime
a7eb8f717e
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-21 09:50:25 -06:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874
...
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
2017-04-21 15:48:52 +02:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts
2017-04-21 08:52:55 +02:00
rallytime
d5b1241972
Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict
...
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
2017-04-20 17:02:33 -06:00
Pablo Suárez Hernández
bd1f170a05
Fixes Zypper unit test
2017-04-19 10:18:46 +01:00
rallytime
885419b3e7
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-17 13:27:58 -06:00
Mike Place
f7b062acd7
Merge pull request #40266 from meaksh/develop-pkg-improvements
...
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
2017-04-17 11:34:42 -06:00
Pablo Suárez Hernández
fa9e7f01f7
Pylint fix
2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02
Adding more unit tests for Zypper module
2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803
Adding unit tests for Zypper execution module
2017-04-17 13:02:08 +01:00
rallytime
f552dd63f3
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac
2017-04-13 12:04:20 -04:00
rallytime
749840ce5f
Merge branch 'nitrogen' into 'develop'
...
No conflicts.
2017-04-11 15:11:46 -06:00
rallytime
cd0adb82d6
Spelling fix
2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b
Remove blacklisted loader usage of dunder variables
2017-04-11 12:16:15 -06:00
rallytime
2cd0c5e4ec
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- doc/topics/cloud/azurearm.rst
- salt/cloud/clouds/vultrpy.py
- salt/modules/aptpkg.py
- salt/modules/dockermod.py
- tests/unit/modules/dockerng_test.py
- tests/unit/modules/test_pillar.py
2017-04-10 14:09:25 -06:00
Chris Heald
5139275602
Add env
support for rvm.installed and rvm.do, opts
support for .installed
...
Currently, the RVM state has no way to pass environment variables (ie, RUBY_CONFIGURE_OPTS)
or compilation flags (-C, --patch) to the Ruby installer. This patch enables this
functionality, permitting installation of customized Ruby installs. For example, the following
should now work:
ruby-2.3.0:
rvm.installed:
- env:
- RUBY_CONFIGURE_OPTS: --with-jemalloc
- opts:
- '--patch /path/to/my.patch'
- '-C --enable-shared,--with-readline-dir=$HOME/.rvm/usr'
2017-04-10 12:40:56 -07:00
Nicole Thomas
93818257cb
Merge pull request #40591 from rallytime/merge-nitrogen
...
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-10 12:07:16 -06:00
rallytime
5a419b8aae
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/pillar.py
2017-04-07 11:23:41 -06:00