valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
65,818 Commits 24 Branches 182 Tags 341 MiB
4baea26c58
Commit Graph

65818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
23b6c08727 Lint fixes for merge-forward 2016-02-12 10:44:18 -06:00
Colton Myers
c57a0310e1 Merge pull request #22 from rallytime/pylint-31151 
Pylint fix for ec2
 2016-02-12 09:31:39 -07:00
Mike Place
7986b9e033 Merge pull request #31153 from edencrane/fix-network-connect-invalid-hostname 
Fixed invalid host causing 'reference to variable before assignment'
 2016-02-12 09:30:19 -07:00
rallytime
8d0947c6a4 Pylint fix for ec2 2016-02-12 09:29:28 -07:00
Mike Place
f5ab76801b Merge pull request #31152 from garethgreenaway/30994_beacon_add_failing_and_other_fixes 
fixes to beacon module, state module and friends
 2016-02-12 09:27:40 -07:00
Colton Myers
0a7b958ae3 Fix s3 test for new kms_keyid parameter/return 2016-02-12 09:21:49 -07:00
Eden Crane
a14c4bb5f2 Fixed invalid host causing 'reference to variable before assignment' 
The current version of exception handling for network.connect references variable '_address', but '_address' is not defined if a call to socket.getaddrinfo failed in the same try block.

eg.
>salt '<minion>' network.connect junkdomain 80
    The minion function caused an exception: Traceback (most recent call last):
      File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1071, in _thread_return
        return_data = func(*args, **kwargs)
      File "/usr/lib/python2.7/site-packages/salt/modules/network.py", line 1104, in connect
        ret['comment'] = 'Unable to connect to {0} ({1}) on {2} port {3}'.format(host, _address[0], proto, port)
    UnboundLocalError: local variable '_address' referenced before assignment

This patch catches socket.getaddrinfo execption socket.gaierror and returns with a friendly fail message.
 2016-02-11 22:18:08 -08:00
Gareth J. Greenaway
91b14dca40 fixing the beacon module and state module to handle passing enabled properly. Also reworking how what is returned from the validating functions is handled to ensure when beacon configurations aren't validate the results indicate exactly why. 2016-02-11 22:06:01 -08:00
Colton Myers
52bc740399 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    salt/cloud/clouds/libcloud_aws.py
    salt/cloud/clouds/opennebula.py
 2016-02-11 22:38:12 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
jacobhammons
c8047d979d Merge pull request #31149 from jfindlay/2015.8 
add 2015.8.7 release notes
 2016-02-11 17:06:15 -07:00
Justin Findlay
b58783b895 add 2015.8.7 release notes 2016-02-11 17:04:34 -07:00
C. R. Oldham
a005e4af55 Documentation clarifications. 2016-02-11 15:05:35 -07:00
David Boucha
42920e61ca Merge pull request #3 from terminalmage/service_delete2 
Fixes for service.delete
 2016-02-11 14:38:09 -07:00
Mike Place
5c394ac49c Merge pull request #31134 from isbm/isbm-zypper-list-products 
Fix types in the output data and return just a list of products
 2016-02-11 13:19:22 -07:00
Mike Place
8f2e3a26e5 Merge pull request #31120 from gtmanfred/2015.8 
Clean up some bugs in the nova driver
 2016-02-11 13:17:41 -07:00
Mike Place
2d592a398e Merge pull request #31132 from rallytime/fix-31099 
Make sure required profile configurations passed in a map file work
 2016-02-11 13:16:46 -07:00
Erik Johnson
723910296f Don't simply use os.listdir to list services 
This makes it so that a service does not still show up after
service.delete is invoked.
 2016-02-11 13:34:18 -06:00
Erik Johnson
cd56aa5076 2 lines between functions (lint fix) 2016-02-11 13:33:37 -06:00
Erik Johnson
566e73128e Don't chkconfig --add in the delete function 2016-02-11 13:32:37 -06:00
David Boucha
5f638366e1 include a versionadded 2016-02-11 11:53:11 -07:00
David Boucha
14a5f9dd5b add versionadded notations 2016-02-11 11:51:45 -07:00
David Boucha
1dd6325da1 add zip passwords to archive.extracted 2016-02-11 11:51:45 -07:00
David Boucha
b1a302cdf5 add password option to unzip 2016-02-11 11:49:48 -07:00
David Boucha
f921582d26 remove python_shell=False 2016-02-11 11:49:42 -07:00
David Boucha
08bd298eb0 add delete function as well as upstart delete func 
The upstart delete function just renames the init file
 2016-02-11 11:49:31 -07:00
David Boucha
b63e122654 add service delete function 2016-02-11 11:49:18 -07:00
David Boucha
506f7008a2 decorator not needed since zipfile is in std lib 
zipfile should be there.

This decorator appears to fail on Windows. The function works fine
without the decorator
 2016-02-11 11:48:35 -07:00
rallytime
1da03da9df Pylint fix 2016-02-11 11:34:27 -07:00
Daniel Wallace
4a411c0817 fix comment 2016-02-11 12:10:52 -06:00
Mike Place
b831e0a865 Merge pull request #31131 from Ch3LL/megan-20158 
integration test for issue #31014
 2016-02-11 10:33:23 -07:00
Mike Place
e378afd891 Merge pull request #31133 from cachedout/fixup_31121 
Fixup 31121
 2016-02-11 10:32:24 -07:00
Mike Place
a4040da46d Fix bad unit test 2016-02-11 10:31:40 -07:00
Bo Maryniuk
670a326e3d Fix types in the output data and return just a list of products 2016-02-11 18:28:14 +01:00
rallytime
337592ec56 Make sure required profile configurations passed in a map file work 2016-02-11 10:13:37 -07:00
Mike Place
a4a40262f8 Merge pull request #31125 from isbm/isbm-salt-api-service 
Force-kill websocket's child processes faster than default two minutes.
 2016-02-11 09:50:57 -07:00
Mike Place
79c85859bc Merge pull request #31119 from sakateka/fix-for-ipv6only-failover 
fixes for ipv6-only multi-master faliover
 2016-02-11 09:21:45 -07:00
Bo Maryniuk
f73f70375c Force-kill websocket's child processes faster than default two minutes. 2016-02-11 15:16:43 +01:00
Jacek Hojczak
0e68fafb74 Fix alternative module and state. 2016-02-11 09:40:26 +01:00
Daniel Wallace
47ecb7a150 include all ips in public_ips or private_ips 2016-02-11 00:14:49 -06:00
Daniel Wallace
b2e8202f5d dont exit on a missing server 
This errors if a server gets deleted between when the server_list and
show_server commands are run.  When running map files to build servers, this
could cause the entire map to be evaluated as needing to be run.

If a server disappears, just continue and don't include it.
 2016-02-10 23:55:42 -06:00
Daniel Wallace
8ad1ee6db4 clean up references to access_ip extra network 
This should make this slightly better, and have everything documented a bit
better.  If salt-cloud to use an extra network that isn't in public_ips or
private_ips, we will overwrite public_ips, and exit.

Then private_ips and public_ips are handled as normal.

Also remove some redundant code that isn't needed
 2016-02-10 23:54:12 -06:00
Ch3LL
af82b1233a integration test for issue #31014 2016-02-10 21:46:22 -07:00
Sergey Kacheev
2c45d151d1 fix unintentional breaking changes 2016-02-11 10:16:29 +06:00
Sergey Kacheev
043a5e6fd7 fixes for ipv6-only multi-master faliover 2016-02-11 10:04:20 +06:00
Colton Myers
5c33fc782a Merge pull request #31113 from rallytime/boron-changes 
Change all relevant Boron references to 2016.3.0
 2016-02-10 17:20:51 -07:00
rallytime
7e40a97a24 Carbo --> Carbon 2016-02-10 16:26:56 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
Mike Place
825b510030 Merge pull request #31107 from techhat/nebulaprivip 
Don't try to add a non-existent IP address
 2016-02-10 14:52:42 -07:00
Mike Place
c56a819fd8 Merge pull request #31108 from jtand/npm_test_fix 
Changed npm integration test to install request.
 2016-02-10 14:52:02 -07:00