Commit Graph

28833 Commits

Author SHA1 Message Date
Chris Rebert
746e88bf4b improve formatting in Linting section of dev docs 2014-04-08 15:18:10 -07:00
Thomas S Hatch
e3c1aa3e94 Lint fixes and comment out unrunnable code 2014-04-08 15:47:20 -06:00
Thomas S Hatch
864e9c4570 lint 2014-04-08 15:44:47 -06:00
Thomas S Hatch
da3b841f38 Merge pull request #11852 from rallytime/bugfix
IOError handling for _read_conf_file function
2014-04-08 15:41:03 -06:00
Thomas S Hatch
287a819f8e Merge pull request #11819 from cachedout/more_md5
Remove hard-coded MD5 wherever possible.
2014-04-08 15:38:23 -06:00
Thomas S Hatch
eb9f962d06 Merge pull request #11814 from garethgreenaway/develop
Adding watch support to mount state
2014-04-08 15:37:41 -06:00
Nicole Thomas
a52969134c Merge pull request #11761 from sctsang/develop
fix issue 11760, host entries append to eol, even lines with comments
2014-04-08 13:59:46 -06:00
Joseph Hall
b1d3045102 Merge pull request #11854 from jeroennijhof/develop
Added cloud provider for opennebula
2014-04-08 13:23:25 -06:00
Jeroen Nijhof
785f13b93a Added cloud provider for opennebula 2014-04-08 21:16:43 +02:00
Pedro Algarvio
aaf70f2f68 The returned value can also be None 2014-04-08 19:19:33 +01:00
root
1c67f5018f fix pylint errors to follow salt code conventions 2014-04-08 17:46:14 +00:00
rallytime
79b5e46893 IOError handling for _read_conf_file function 2014-04-08 10:41:09 -06:00
Joseph Hall
93f9222ade Merge pull request #11850 from zeezooz/iptables_pknock_name
Allow name argument for pknock iptables module.
2014-04-08 09:17:24 -06:00
Joseph Hall
92435462a9 Merge pull request #11849 from zeezooz/iptables_save_family
Use family when saving iptables rule.
2014-04-08 09:08:23 -06:00
Andrew Burdo
ee030a0b2a Allow name argument for pknock iptables module. 2014-04-08 18:07:37 +03:00
Andrew Burdo
172262d07c Use family when saving iptables rule.
Will save ipv6 rules to proper file.
2014-04-08 18:00:43 +03:00
Pedro Algarvio
469ab4abaf Take into account None 2014-04-08 15:51:09 +01:00
Pedro Algarvio
640de961ac A new argument was added to the call, adjust. 2014-04-08 15:38:22 +01:00
Pedro Algarvio
723ce8c97f Improve script output 2014-04-08 15:13:59 +01:00
Pedro Algarvio
e73b8abb15 Merge pull request #11844 from s0undt3ch/develop
`salt/templates/lxc/salt_tarball` is an expectable executable.
2014-04-08 14:52:42 +01:00
Pedro Algarvio
34e8eb52ab Print some more additional information. 2014-04-08 14:50:03 +01:00
Pedro Algarvio
6dd262a6d4 delete_vm only accepts a dict, not a string 2014-04-08 14:37:40 +01:00
Pedro Algarvio
449765f808 Raise an error if the result is not a dict 2014-04-08 14:00:02 +01:00
Pedro Algarvio
c07ef89f93 salt/templates/lxc/salt_tarball is an expectable executable. 2014-04-08 13:47:26 +01:00
Pedro Algarvio
462b49d860 Merge pull request #11841 from s0undt3ch/develop
Comment indentation fix
2014-04-08 10:08:42 +01:00
Pedro Algarvio
7eed716085 Comment indentation fix 2014-04-08 10:08:05 +01:00
Pedro Algarvio
6f2369defd Merge pull request #11838 from s0undt3ch/develop
Better variable names.
2014-04-08 10:05:34 +01:00
Pedro Algarvio
dabe98e2e2 Merge pull request #11839 from bretep/add-requests-to-debian-build
Require python-requests for install
2014-04-08 08:46:35 +01:00
Bret Palsson
5f8f3d3f28 Require python-requests for install 2014-04-08 07:40:08 +00:00
Pedro Algarvio
cfcc006a75 Merge pull request #11837 from bretep/patch-5
Support change from urllib2 to requests lib.
2014-04-08 08:37:03 +01:00
Pedro Algarvio
33ca7f6817 Better variable names. 2014-04-08 08:30:47 +01:00
Bret Palsson
1134d34a2d Support change from urllib2 to requests lib.
Commit f809f91 changed the fileclient from urllib2 to requests. To properly build a .deb package we need to add python-requests to the build dependencies.
2014-04-07 23:11:14 -07:00
Thomas S Hatch
2df20719de Allow for more files to be more easily set to executable
This allows for files to just be listed and then BAM! They are
installed executable
2014-04-07 23:29:29 -06:00
Thomas S Hatch
f02ed6ad47 import salt._compat 2014-04-07 23:21:02 -06:00
Thomas S Hatch
96842191c7 Add auto snapshotting for lvm backed lxc containers
This makes the init call automatically create a base lvm
container to build clones from, making it a great deal faster
and space efficient to spin up many containers and all without
needing human intervention apart from cofiguring the volume group
to use
2014-04-07 22:58:20 -06:00
Joseph Hall
33685d4e32 Merge pull request #11832 from gtmanfred/serviceCatalog
Remove the global conn variable. fixes #11831
2014-04-07 18:00:52 -06:00
Joseph Hall
adf3b91c2e Merge pull request #11834 from cvrebert/patch-1
modules.dockerio.port(): fix typo
2014-04-07 17:57:16 -06:00
Chris Rebert
bdc9c26b00 modules.dockerio.port(): fix typo
************* Module salt.modules.dockerio
salt/modules/dockerio.py:708: [W0613(unused-argument), port] Unused argument 'private_port'
2014-04-07 16:42:08 -07:00
Daniel Wallace
93392e517f Remove the global conn variable. fixes #11831
This should have been removed before the previous pull request
2014-04-07 18:18:10 -05:00
Thomas S Hatch
fb8f1ddfc0 Merge pull request #11823 from gtmanfred/serviceCatalog
Use the service_catalog, auth_token, and bypass_url in order to decrease authentications
2014-04-07 17:00:31 -06:00
Thomas S Hatch
77660628a3 don't exit without a newline 2014-04-07 16:52:17 -06:00
Thomas S Hatch
11a6295a18 Hard kill with a destroy 2014-04-07 16:52:17 -06:00
Thomas S Hatch
f1a2b7abb5 Add kill option to lxc-stop 2014-04-07 16:52:17 -06:00
Pedro Algarvio
148c8063e4 Prefer subprocess.Popen, we're not streaming anything. 2014-04-07 23:26:23 +01:00
Thomas S Hatch
737a21c34c Add lxc templates to the mix 2014-04-07 16:19:47 -06:00
Pedro Algarvio
7b82b771f8 Merge pull request #11829 from s0undt3ch/develop
Prefer `subprocess.Popen` for now
2014-04-07 23:16:04 +01:00
Pedro Algarvio
a22a3af684 Prefer subprocess.Popen for now 2014-04-07 23:14:27 +01:00
Pedro Algarvio
4a44848ad2 Merge pull request #11826 from s0undt3ch/develop
Prefer `testrun-no-deps` over `testrun`.
2014-04-07 23:05:57 +01:00
Daniel Wallace
7f85139e22 fix keystone module for pylint 2014-04-07 17:05:52 -05:00
Daniel Wallace
51f4c8d16a pylint fixes 2014-04-07 17:05:52 -05:00