valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,284 Commits 24 Branches 182 Tags 341 MiB
46712f7ef2
Commit Graph

118 Commits

Author SHA1 Message Date
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4809e09f52 Fix pylint errors 2016-03-08 11:54:03 -06:00
Kris Raney
3487f55e83 Add NAT Gateway support to boto_vpc 2016-03-07 09:41:03 -06:00
rallytime
73d73e80c1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/topics/releases/2015.8.4.rst
  - doc/topics/releases/2015.8.5.rst
  - doc/topics/thorium/index.rst
  - salt/cloud/clouds/opennebula.py
  - salt/engines/thorium.py
  - salt/loader.py
  - salt/modules/archive.py
  - salt/modules/boto_vpc.py
  - salt/modules/data.py
  - salt/modules/reg.py
  - salt/pillar/mysql.py
  - salt/runners/cache.py
  - salt/states/archive.py
  - salt/states/cron.py
  - salt/states/file.py
  - salt/states/glance.py
  - salt/states/reg.py
  - salt/thorium/__init__.py
  - salt/thorium/check.py
  - salt/thorium/file.py
  - salt/thorium/reg.py
  - salt/utils/jid.py
  - salt/utils/parsers.py
  - setup.py
 2016-02-12 14:38:50 -07:00
justinta89
053ae0cae6 Updated tests to work with code deprecations 2016-02-11 11:22:35 -07:00
rallytime
6ad7642f6d Lint 2016-02-04 11:00:02 -07:00
rallytime
58778dfc88 Fix failing boto_vpc module unit tests 2016-02-04 10:33:41 -07:00
rallytime
b5ec0991b0 Pylint fix 2016-02-03 15:00:44 -07:00
justinta89
00943ff1e6 Boto uses False for is_default instead of None 2016-01-19 10:15:35 -07:00
Mike Place
cf440036dd Remove unused import 2016-01-11 14:14:50 -07:00
Mike Place
36d55ea0ad Allow modules to be packed into boto utils 
A workaround to allow modules to be packed into the namespace for the boto utils.
 2016-01-11 14:13:07 -07:00
rallytime
f7e58a241c Merge branch '2015.5' into '2015.8' 
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
 2015-12-29 15:27:03 -07:00
justinta89
e706642152 Skipping some Boto tests until resolved moto issue 
Similar to #29725. Though, some of the tests are different, due to the older
branch. I'm not condisidering this a backport because of that.
 2015-12-27 22:34:09 -07:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:59:14 -07:00
rallytime
65fdb50246 Get the list indice to compart before looking at keys 2015-10-26 14:20:27 -04:00
rallytime
95defb87c5 Add test for availability_zone check to boto_vpc_tests 2015-10-26 10:15:29 -04:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
 2015-07-08 16:24:58 -06:00
rallytime
f959e165a1 Clean up imports 2015-07-07 06:28:10 -06:00
rallytime
fbc9c0d6bf Fix Pylint 2015-07-07 05:43:00 -06:00
rallytime
fe2561f415 Update moto version check in boto_vpc_test and update min version 
Fixes #24272
 2015-07-06 14:03:59 -06:00
Colton Myers
60f2e9eefb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/development/contributing.rst
    salt/modules/tls.py
 2015-05-26 16:38:42 -06:00
rallytime
ac0f97de51 Fixes the boto_vpc_test failure on CentOS 5 tests 
pkg_resources.get_distribution doesn't work on CentOS 5 since it looks
for moto in site-packages and not pip (which is how we're installing it
in the salt-jenkins states).

This catches the exception through by get_distribution so we can run the
rest of the tests in this file.
 2015-05-26 12:25:51 -06:00
Matthew Williams
68c7ba77a0 fix lint in boto_vpc execution module tests 2015-04-27 16:55:19 +00:00
Matthew Williams
76f739d7c7 boto_vpc: lint 2015-04-27 16:05:55 +00:00
Matthew Williams
91e155a960 add TODO to boto_vpc execution module tests 2015-04-27 06:17:34 +00:00
Matthew Williams
f3d994a1c5 modules.boto_vpc: return dicts from all functions 2015-04-25 04:22:42 +00:00
Matthew Williams
afd182479c modules.boto_vpc: fix a couple bugs 2015-04-20 15:09:01 +00:00
Matthew Williams
9ddfc6c82b boto_vpc: [WIP] always return dicts 2015-04-17 05:18:17 +00:00
Matthew Williams
3501a28d03 boto_vpc_test: fix indentation 2015-04-15 02:58:06 +00:00
Matthew Williams
db8a9afc16 boto_vpc: remove duplicate func decl; fix string format 2015-04-15 02:00:34 +00:00
Matthew Williams
393f42c7b3 boto_vpc: test fixes 2015-04-14 01:23:50 +00:00
Matthew Williams
7b879f57de Merge branch 'boto_utils' into mergetest 
Conflicts:
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2015-04-14 01:21:49 +00:00
Matthew Williams
4959bf4e1a modules.boto_vpc use utils get_conn and cache_id 2015-04-13 18:07:15 +00:00
Matthew Williams
6f9434cb10 [WIP] refactor boto_vpc execution module 2015-04-08 02:19:06 +00:00
Matthew Williams
6349352743 boto_vpc_test: fix name->subnet_name 2015-04-01 17:50:51 +00:00
Matthew Williams
89870b9146 fix typo in boto_vpc tests 2015-04-01 16:57:54 +00:00
Claudiu Popescu
5562422135 Test parameters for delete_subnet 2015-03-31 15:04:20 +02:00
Claudiu Popescu
573027569c Version and test fixes 2015-03-31 14:57:47 +02:00
Justin Findlay
ebbb113f7a fix boto_vpc unit test and error message 2015-03-23 19:48:53 -06:00
Matthew Williams
69966fd838 fix lint 2015-03-18 16:31:05 +00:00
Matthew Williams
92e11a3539 add __context__ to boto_vpc test 2015-03-18 15:18:43 +00:00
Pedro Algarvio
63dc6ae7d5 Py3 compatibility fixes 2015-01-30 22:25:12 +00:00
Pedro Algarvio
60f215f191 Add from __future__ import absolute_import 2015-01-30 22:25:04 +00:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Pedro Algarvio
55b68c389d Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:40:47 +00:00
Pedro Algarvio
2396568dd5 Remove unused import 2014-12-02 01:36:49 +00:00
Pedro Algarvio
b37c76a800 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/boto_vpc_test.py
 2014-12-02 01:09:15 +00:00
Pedro Algarvio
6530a7911e Disable the false import error 2014-12-02 01:06:56 +00:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00