Commit Graph

30418 Commits

Author SHA1 Message Date
Henrik Holmboe
fb03e79f97 Reflect the latest released version
This is a recurring problem in the release process. The same issue was pointed out for 2014.1.3 and is again a problem for 2014.1.4. Perhaps not the most severe issue here but I think it points to a bigger problem with the release management/process.

See https://github.com/saltstack/salt/issues/12032#issuecomment-41038471 for my comment and a discussion regarding the issue as a whole.
2014-05-12 12:57:27 +02:00
Pedro Algarvio
e988137d90 Merge pull request #12688 from gtmanfred/develop
add missing parenthesis
2014-05-12 02:03:41 +01:00
Daniel Wallace
f3e7b0a190 add missing parenthesis 2014-05-11 18:20:39 -05:00
Seth House
0d685d123a Merge pull request #12526 from markizano/hotfix.11611
Addressing issues/concerns in #11611
2014-05-11 14:38:53 -06:00
Joseph Hall
1e99177c92 Merge pull request #12677 from gtmanfred/nova
Fix up some cloud stuff
2014-05-11 12:13:24 -06:00
Pedro Algarvio
adac7ba7e7 Merge pull request #12676 from garethgreenaway/ssh_host_key_fixes
Add missing ECDSA, ED25519 ssh key file types.
2014-05-11 15:06:38 +01:00
Joseph Hall
40dcf8793c Merge pull request #12667 from s0undt3ch/hotfix/ssh-tests
Ssh tests
2014-05-11 06:51:34 -06:00
Daniel Wallace
64cb2777cf Add warning about __exit__
Required for with: statement
2014-05-10 20:35:07 -05:00
Erik Johnson
710c9579cb Add clarification for pull #12678 2014-05-10 20:05:11 -05:00
Erik Johnson
d174a5c97a Merge pull request #12678 from eliasp/pkg_resource-deduplicate-pkg-versions
Drop duplicated versions in salt.modules.pkg_resource.sort_pkglist()
2014-05-10 20:03:39 -05:00
Daniel Wallace
31cd6786c6 fix capitalization in except statements
I blame vim.
2014-05-10 19:45:18 -05:00
Daniel Wallace
11d11fc0ad Fix pylint error 2014-05-10 19:26:03 -05:00
Elias Probst
cc87598c0a Drop duplicated versions in salt.modules.pkg_resource.sort_pkglist() 2014-05-11 02:23:14 +02:00
Daniel Wallace
66a3403efd Give a better error for failed servers
If there is a failed server without the 'progress' attribute, then
server_list_detailed fails.  This also fails with trying to start
anything that uses cloud, because it can't get the first command
started.
2014-05-10 19:19:18 -05:00
Gareth J. Greenaway
c8b89597f4 Add missing ECDSA, ED25519 ssh key file types. 2014-05-10 16:06:53 -07:00
Daniel Wallace
5f360dd0b8 Use the with_statement from python3
http://legacy.python.org/dev/peps/pep-0343/

call __exit__ correctly from novaclient

98934d7bf1 (diff-709c13ba674c4ae39f66e0ff604c1c21R172)
2014-05-10 17:58:25 -05:00
Daniel Wallace
5c0f62c312 Close with statement earlier
This stuff doesn't need to be in the with statement
2014-05-10 17:57:19 -05:00
Daniel Wallace
2310d0996e Requests has errors with ssl
If you don't use the __exit__ for closing out the connection on the
authentication, everything fails.

Unfortunately this isn't fully in novaclient yet.  Waiting for the tag
for python-novaclient 2.18 ... which isn't tagged yet.
2014-05-10 17:24:31 -05:00
Daniel Wallace
fcdfb6bc81 Catch errors for volume_show 2014-05-10 17:22:03 -05:00
Daniel Wallace
023757d086 reorganize the variables
Define everything to make sure that it goes to the correct variables.
2014-05-10 17:20:17 -05:00
Joseph Hall
1437967109 Merge pull request #12675 from gtmanfred/nova
Fix kwargs for volumes
2014-05-10 14:23:30 -06:00
Daniel Wallace
a5b20097a4 Fix kwargs for volumes
Makes sure that the correct bypass_url gets set for volumes.
2014-05-10 15:19:18 -05:00
Pedro Algarvio
df802117b1 Remove extra new line 2014-05-10 15:09:13 +01:00
Pedro Algarvio
532bc7fc2f Merge pull request #12668 from s0undt3ch/hotfix/transifex-updates
Update 'doc/.tx/config' - Build #48
2014-05-10 14:52:34 +01:00
Pedro Algarvio
ea00232d87 Update 'doc/.tx/config' - Build #48
http://cookingwithsalt.org/job/salt/job/transifex/48/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-05-10 14:51:52 +01:00
Pedro Algarvio
592c669f75 Add coding header 2014-05-10 14:42:41 +01:00
Pedro Algarvio
8f1f212a7f Remove trailing white-space. 2014-05-10 14:41:48 +01:00
Mike Place
d7bba818a9 Only listen on localhost. 2014-05-10 14:18:53 +01:00
Mike Place
1fe291346f Cleanup 2014-05-10 14:18:53 +01:00
Mike Place
0cbac67a3f Support for continuous integration testing of salt-ssh 2014-05-10 14:18:53 +01:00
Pedro Algarvio
9630d43d05 Add option to run SSH tests.
Refs saltstack/salt-testing#16 and #12661
2014-05-10 14:12:04 +01:00
Pedro Algarvio
bbe00d8206 Merge pull request #12666 from terminalmage/update-spec
Update RPM spec for 2014.1.4
2014-05-10 12:19:09 +01:00
Erik Johnson
82960a7480 Update RPM spec for 2014.1.4 2014-05-10 00:06:33 -05:00
Thomas S Hatch
0e50d06b34 Merge pull request #12662 from eliasp/win_repo-empty-productname
Fix numerous crashes in consumers of Windows package lists due to empty package names.
2014-05-09 17:09:42 -06:00
Elias Probst
5d07e9464e Fix numerous crashes in consumers of Windows package lists due to empty package names. 2014-05-10 00:34:48 +02:00
Joseph Hall
8477d9ba06 Merge pull request #12660 from gtmanfred/nova
Adding network and virtual_interface commands to the cloud module
2014-05-09 15:04:01 -06:00
Daniel Wallace
c10443394f cloud client extra_actions needs a names variable 2014-05-09 15:33:19 -05:00
Daniel Wallace
c34e1c8dd1 Fix pylint issues 2014-05-09 15:29:09 -05:00
Daniel Wallace
d569c37a75 Document the new cloud module functions 2014-05-09 15:29:09 -05:00
Daniel Wallace
346721193c Clean up virtual interface attach 2014-05-09 15:29:09 -05:00
Daniel Wallace
8a47524f6c Add virtual interfaces 2014-05-09 15:29:09 -05:00
Daniel Wallace
5a256d5fe8 Combine volume and network into extra actions 2014-05-09 15:29:09 -05:00
Daniel Wallace
60d3932bf9 Add network action to CloudClient
Allows for creating and deleting extra networks and the likes
2014-05-09 15:29:08 -05:00
Daniel Wallace
7542fba756 Add network create function 2014-05-09 15:29:08 -05:00
Daniel Wallace
31cbff6954 Add in networks
Include the posibility to use extensions, for stuff like rackspace's
os-networksv2

my-nova:
  minion:
    mine_functions:
      network.ip_addrs: []
    startup_states: sls
    sls_list:
      - cloud.novaclient
  identity_url: 'https://identity.api.rackspacecloud.com/v2.0/'
  extensions:
    networks: os_networksv2_python_novaclient_ext
    virtual_interfaces: os_virtual_interfacesv2_python_novaclient_ext
  protocol: ipv4
  compute_region: IAD
  user: USERNAME
  tenant: TENANTID
  provider: nova
  api_key: APIKEY
  os_auth_plugin: rackspace
  wait_for_ip_timeout: 6000
2014-05-09 15:29:08 -05:00
Thomas S Hatch
039e0841c1 Merge pull request #12548 from cachedout/12111
Eauth improvements and fixes
2014-05-09 13:55:42 -06:00
Thomas S Hatch
6a645041f1 Merge pull request #12657 from whiteinge/state-event-out-buffer
Force Python to flush to stdout whenever we have an event to print
2014-05-09 13:49:08 -06:00
Joseph Hall
991a659961 Merge pull request #12658 from KennethWilke/develop
Added more redis functionality
2014-05-09 12:27:14 -06:00
KennethWilke
eb6d049502 Added more redis functionality 2014-05-09 13:02:57 -05:00
Seth House
da432237ad Force Python to flush to stdout whenever we have an event to print
We want to see events as soon as they come in without waiting on the
output buffer to fill up. Is there a less heavy-handed way to do this?
2014-05-09 11:53:17 -06:00