Commit Graph

141 Commits

Author SHA1 Message Date
twangboy
47fb8379d7 Remove hosts and aliases from sub_minion conf 2016-07-26 16:07:55 -06:00
twangboy
d7800567f5 Fix hosts integration test 2016-07-26 16:00:07 -06:00
Mike Place
5f5d7193b0 Add interface to all configs
This got removed during the attempt to make the tests run on Windows.

I added them everywhere even though that's not strictly necessary.

Without these set on the master and sub_master, Windows will throw
erorrs because the networking stack will decide that anything that's
bound to 0.0.0.0 represents an extestential threat to any socket that
attempts to *connect* to one of those ports. (For...reasons.)
2016-07-20 10:00:31 -06:00
twangboy
4e56d28993 Add tcp_master settings to both masters 2016-07-20 10:00:31 -06:00
twangboy
3833c008b2 Cleans up config parameters 2016-07-20 10:00:30 -06:00
twangboy
c1ae2537f1 Remove configuration from configs 2016-07-20 10:00:30 -06:00
twangboy
79b5be6989 Add more descriptive report for interactive mode 2016-07-20 10:00:30 -06:00
twangboy
54647eb7d8 Fix mem leak caused by pki_dir 2016-07-20 10:00:30 -06:00
twangboy
7f3f15378e Make additional changes to master configs 2016-07-20 10:00:30 -06:00
twangboy
a33c5c15da Fix master and sub_minion configs 2016-07-20 10:00:30 -06:00
twangboy
f55ba87bee Fix configs, remove default values 2016-07-20 10:00:30 -06:00
twangboy
9b14dc0a6e Add Pedro's suggestions 2016-07-20 10:00:30 -06:00
twangboy
1805630fdc Fix integration tests on windows 2016-07-20 10:00:29 -06:00
twangboy
f7fb4985c4 Add Pedro's suggestions 2016-07-20 10:00:29 -06:00
twangboy
5bcb27e477 Fix integration tests on windows 2016-07-20 10:00:29 -06:00
Mike Place
4eb272da3c Merge pull request #33510 from pass-by-value/salt_cloud_env_vars
Add SDB module for environment variables
2016-05-26 12:26:16 -07:00
Aditya Kulkarni
5cae7e5b1f Add SDB module for environment variables 2016-05-25 17:18:35 -04:00
Pedro Algarvio
3adf8e286e
Some more test suite run fixes
* Allow more time for the daemons to react to the signals sent
* Fix configuration
* More logging
2016-05-23 13:57:21 +01:00
twangboy
b60bc974a0
Fix clean function for windows 2016-05-23 13:56:06 +01:00
Pedro Algarvio
7a8460856c
Define IDs and ports on sample configs 2016-05-23 13:56:01 +01:00
rallytime
7bf9f5d0f5 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/man/salt.7
  - doc/ref/executors/all/salt.executors.direct_call.rst
  - doc/ref/executors/all/salt.executors.splay.rst
  - doc/ref/executors/all/salt.executors.sudo.rst
  - salt/cloud/clouds/vultrpy.py
2016-05-18 09:40:48 -06:00
C. R. Oldham
8387657d9a Prevent salt-cloud from hanging when spinning up new Vultr instances (#33272)
* better support for named images, locations, sizes

* better support for named images, locations, sizes

* Tests for Vultr driver

* Add sleep so test instance will be old enough to delete as part of the test

* Lint.
2016-05-16 13:11:29 -07:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
2016-02-25 16:21:15 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
2016-02-25 12:36:22 -07:00
justinta89
421a112914 Added config_dir to test minion config 2016-02-23 19:40:22 -07:00
LoveIsGrief
6cfb447cff Introduce profiles for testing
* virtualbox-deploy-conf won't deploy a script
* virtualbox-minion will do a full deploy with a minion config

Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:39:36 +01:00
LoveIsGrief
1a8cd747c5 Feature: deploy salt on machine when creating
We need to setup the tests with a profile that wants to deploy and use the profile

Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:39:36 +01:00
LoveIsGrief
59d212acb1 Provider is getting deprecated in the config
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:39:35 +01:00
LoveIsGrief
b0752a3d82 Implement list_nodes_select
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:39:35 +01:00
LoveIsGrief
98ad2cbe71 Add virtualbox to profile checks
Virtualbox needs the 'clonefrom' property and it doesn't need size

Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:38:54 +01:00
LoveIsGrief
1545c9de7f Setup testing for calls to salt-cloud
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:38:11 +01:00
LoveIsGrief
b9ec577d11 Add basic configuration for the tests
Related to saltstack/salt#27089 Saltcloud virtualbox provider
2016-02-10 21:38:11 +01:00
Ethan Devenport
44491f69cf Adds cloud provider support for ProfitBricks Cloud Computing Infrastructure Services. 2016-01-21 22:52:25 +00:00
rallytime
e14931ff2d Also add -Z to script args for cloud tests 2015-08-24 16:11:01 -06:00
rallytime
0d6eebf3c3 Extra lines 2015-08-24 15:12:31 -06:00
rallytime
c69c918b46 Add script_args: '-P' to Ubuntu 14 profiles for nightly cloud tests 2015-08-24 15:12:25 -06:00
rallytime
b68e3c0d0c Update the Azure Cloud Provider tests to be more acurate and use newer azure SDK version 2015-06-25 15:14:21 -06:00
rallytime
7ed776c293 Cloud tests should use an image that is LTS
Changes the test image to create for digital ocean cloud tests to be on Ubuntu 14.04, not 14.10
2015-05-18 14:04:24 -06:00
rallytime
7e15ff94ff Move digital_ocean_v2 tests to be the defauly/only tests for digital ocean cloud tests 2015-05-14 15:25:00 -06:00
Thayne Harbaugh
6f4cfd01fc Specify compound matches as lists
Compound matches, such as nodegroups, can now be specified as lists.  This
avoids splitting on whitespace which may be part of a key or value.

Right now this only works for nodegroups.  Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Colton Myers
ef583295d5 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    salt/beacons/service.py
2015-04-20 11:41:25 -06:00
Thayne Harbaugh
b37b6b2849 Add a test for incorrectly-nested nodegroups that cause a resolution loop. 2015-04-17 17:01:47 -06:00
Thayne Harbaugh
6c1d4d58e9 Fix failure with nested nodegroups:
If a nodegroup was re-used - even if it wasn't a circular reference - it
would fail the nodegroup expansion with the following message:

    Failed nodegroup expansion: illegal nested nodegroup "min"

This was simply because already-visited nodegroups are pushed into `skip`
but were never popped.

   * Add another test case for this situation.
   * Pop the current nodegroup from `skip` when leaving the expansion
     context

Fixes: #22797
2015-04-17 15:20:34 -06:00
Tomas Sirny
42d26cc699 Shorter disk resource definition 2015-04-17 16:30:06 +02:00
Tomas Sirny
5d93b7619d Working test for extended profile 2015-04-17 15:40:08 +02:00
Tomas Sirny
6f34f0db74 Allow setting multiple disks and scopes on create of instance for GCE 2015-04-17 15:40:08 +02:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Damian Myerscough
c6e618bc5f Digital Ocean APIv2 Integration Testing 2015-04-10 21:30:09 -07:00
Thayne Harbaugh
1c3536fb8e Support nested nodegroups
Nodegroups can be recursively expanded without worrying about other
compound matcher expansions.  Once the nodegroups are expanded on the
master the remaining flattened compound match can be expanded without the
nodegroup information.
2015-04-08 23:16:39 -06:00
Mike Place
018400d94c Remove loop interval setting, was causing cpus to spin 2015-04-03 15:34:47 -06:00