Commit Graph

260 Commits

Author SHA1 Message Date
Pedro Algarvio
bba9c3f4d2 Update generated salt/_version.py file to use __saltstack_version__. 2014-05-06 05:43:22 +01:00
Samuel M Smith
a68daa450f Removed references to raet and table from setup.py 2014-04-10 16:59:56 -06:00
Jason Mehring
37a1c690c7 salt.utils.serializers package missing from setup.py 2014-04-09 05:35:07 -04:00
Pedro Algarvio
33ca7f6817 Better variable names. 2014-04-08 08:30:47 +01: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
737a21c34c Add lxc templates to the mix 2014-04-07 16:19:47 -06:00
David Boucha
f02dfbbd04 Include psutil on Windows 2014-03-31 11:21:08 -06:00
Gareth J. Greenaway
19f5d19f1f change in InstallLib assumes build/lib/salt and looks for a file based on that assumption. on certain platforms this fails and causes the setup.py to fail. 2014-03-18 20:27:48 -07:00
Massimiliano Torromeo
ba92bb7b81 Fix permissions of the ssh-id-wrapper script 2014-03-17 17:56:31 +01:00
Massimiliano Torromeo
8f69fa4fb9 Moved git wrapper script to the package templates directory 2014-03-14 09:21:09 +01:00
Massimiliano Torromeo
4b620f0097 Add salt-git-ssh script to pass the ssh identity to the git command. 2014-03-14 09:21:09 +01:00
Massimiliano Torromeo
e1fbcb8ce1 Fix template packaging issue 2014-03-13 11:24:30 +01:00
Thomas S Hatch
ab576bb069 Merge pull request #10920 from gtmanfred/nova
Create SaltNova class
2014-03-04 19:36:30 -08:00
Thomas S Hatch
848207e541 Add client.raet to packages 2014-03-03 22:10:43 -07:00
Daniel Wallace
742ecfa53b add to setup.py 2014-03-03 15:04:52 -06:00
Mathieu Le Marec - Pasquet
6483539dc3 fix setup.py typo 2014-03-02 15:58:19 +00:00
Thomas S Hatch
6a3152255a Don't fail the setup.py if zmq is a liile on the old side 2014-02-26 15:35:25 -07:00
Thomas S Hatch
6969758108 Add salt-unity to the base deployment 2014-02-26 15:17:14 -07:00
Pedro Algarvio
13cfa54065 Properly handle PyZMQ >= 0.14 when freezing 2014-02-26 06:24:55 +00:00
Thomas S Hatch
b15387920d Add the floscripts to the setup.py 2014-02-25 14:35:34 -07:00
Thomas S Hatch
613926b27e update the setup.py for daemons/flo dir rename 2014-02-25 10:41:25 -07:00
Christopher A. Stelma
f5bdf7a24b full module list and alphabetize 2014-02-05 16:50:41 -08:00
Christopher A. Stelma
a0245efb85 package salt.daemons 2014-02-05 16:37:31 -08:00
Nahum Shalman
7b9712c2d2 SmartOS Esky build: Just try to grab everything
After discovering missing modules one at a time I went in search
of a bigger hammer.

We use the bbfreeze ModuleGraph code to find all deps for
salt.modules.* and add them to the FREEZER_INCLUDES variable.

It may be worth trying this approach for other platforms...
2014-01-30 14:06:19 -05:00
Alexey Ivanov
62464b237f setup: fixed shebang 2014-01-13 00:58:57 -08:00
David Boucha
a7807a92d9 Add more Windows libraries to freezer 2014-01-10 12:27:40 -07:00
David Boucha
6eae8acfa4 add win32net to windows freezer includes 2014-01-10 10:12:04 -07:00
Pedro Algarvio
ad54eca1ab Only update the bootstrap script on request. Fixes #9535. 2014-01-03 01:24:17 +00:00
Thomas S Hatch
ae9d127a99 Add salt.transport to installed packages 2013-12-23 10:27:53 -07:00
Thomas S Hatch
7407f8b75b Merge pull request #9043 from garethgreenaway/develop
Adding support to manage networks on Debian/Ubuntu systems.
2013-12-06 08:21:31 -08:00
Pedro Algarvio
9226f98bfe Let's include Salt Cloud to avoid circular import issues in Windows. 2013-12-05 20:46:35 +00:00
Gareth J. Greenaway
e30bd1673e Adding support to manage networks on Debian/Ubuntu systems. 2013-12-04 20:38:25 -08:00
Pedro Algarvio
9767d83e67 salt.cloud.utils is no longer a package. 2013-11-21 20:33:12 +00:00
Pedro Algarvio
582207634a apache-libcloud should not be a dependency for Windows. 2013-11-18 17:39:27 +00:00
Pedro Algarvio
60dabead8f Invert debugging logic. 2013-11-15 17:23:58 +00:00
Pedro Algarvio
5c1fc92715 Strip ALL non windows scripts from sdist. 2013-11-15 17:22:29 +00:00
Pedro Algarvio
99148a1380 Better exec() detection. Avoids esky build NameError. 2013-11-14 23:01:30 +00:00
Pedro Algarvio
12880907d8 Make PyLint a bit happier. 2013-11-14 18:49:26 +00:00
Pedro Algarvio
8c14e211b7 Fix some missing variables and imports. 2013-11-14 18:18:51 +00:00
Pedro Algarvio
2c53c11793 Add support to download the latest stable bootstrap script.
If we're not installing under Windows, provide the same features salt-cloud had at install time before the merge.
2013-11-14 18:06:12 +00:00
Pedro Algarvio
9e5ba8c45f Another missing comma. 2013-11-14 08:22:42 +00:00
Pedro Algarvio
5e76d602ea Add some missing commas. 2013-11-14 07:59:55 +00:00
Pedro Algarvio
62263be9c8 Man7 should be included. 2013-11-14 07:54:31 +00:00
Pedro Algarvio
344cb8f120 There are still some more script which should not be available on windows. 2013-11-14 07:52:28 +00:00
Pedro Algarvio
20434a19a5 Append on the right key. 2013-11-14 07:25:46 +00:00
Pedro Algarvio
56ac7137fd Salt cloud should not be packaged to windows. 2013-11-14 07:20:01 +00:00
dongweiming
be18f72a69 Modify: clean use glob to match filename that need remove 2013-11-12 13:10:41 +08:00
Pedro Algarvio
76d1629ba4 doc/man/salt-cloud.7 is no longer generated. 2013-11-10 13:47:14 +00:00
Thomas S Hatch
e0b1a02ef1 Initial add of salt-cloud to setup.py 2013-11-08 14:47:41 -07:00
Nahum Shalman
5079d271fb Add 'email' and 'email.mime.*' to all esky builds
Fixes "ImportError: No module named audio" on SmartOS

Uses 'email.mime.*' rather than a full list of entries.

Also removes a duplicate entry for 'fileinput' from the
windows section that was added to the main FREEZER_INCLUDES

Email thread that suggested this fix:
https://groups.google.com/forum/#!msg/salt-users/_9ynHspSgjk/so0hRdbaPM0J

Tested as a fix to a 0.17.1 checkout on SmartOS.
2013-10-29 14:24:45 -04:00
David Boucha
4f247a635a These modules are needed for frozen Windows builds 2013-10-28 12:18:36 -06:00
Thomas S Hatch
387f097959 Merge pull request #7807 from scottp-dpaw/develop
Bootstrapping for Windows minions
2013-10-15 09:49:08 -07:00
Valentin Bud
5ae5b70794 Added salt.utils.validate to setup.py. 2013-10-15 14:28:58 +03:00
Scott Percival
6e8dd2a02c Added more modules missed by bdist_esky 2013-10-10 17:01:17 +08:00
David Boucha
d5a7b2195c Add fileinput to list of Windows modules to freeze 2013-10-08 08:03:08 -06:00
Ajith Antony
b95a5d9fd0 Virt Template deploy, and serial xml tests
- Added virt templates to setup
- moved NIC xml string template to file
- added tests for serial xml
2013-10-03 13:21:34 -05:00
Thomas S Hatch
3f0b151bda Merge pull request #6968 from s0undt3ch/features/6962-extra-state-kwargs-error
State calls now fail if non-supported arguments are used. Fixes #6962.
2013-09-27 08:01:13 -07:00
Niels Abspoel
7eeb8c6e20 fix for issue #7436 no templates in salt
One line in setup.py that says salt.templates package should be build.
2013-09-26 23:39:00 +02:00
Thomas S Hatch
1a3e1b0350 Add doc directory to clean routine 2013-09-26 10:44:14 -06:00
Pedro Algarvio
528ee3ae14 salt.utils.decorators is now a package. 2013-09-24 22:08:08 +01:00
Henrik Holmboe
8960189d22 Move jinja template files into salt/templates
See #7291. This is the first step.
2013-09-24 17:04:41 +02:00
Niels Abspoel
a655aa534c fix missing man page for salt-ssh fixes #7042 2013-09-19 21:14:38 +02:00
Henrik Holmboe
a8779ac96d Upcase constant 2013-09-19 12:42:09 +02:00
Thomas S Hatch
ff31ed9404 Add wrapper pkg to setup.py 2013-09-01 21:30:37 -06:00
Pedro Algarvio
3f31b06a5d salt.log.handlers is a package now. 2013-08-30 19:32:39 +00:00
Pedro Algarvio
08d5791f10 salt.log is now a package instead of a module.
The necessary changes were made to assure backwards compatibility.
2013-08-30 19:32:38 +00:00
mickey
f79e2b2bb9 Removed salt.ssh from the packages as it was moved to salt.client.ssh 2013-08-30 06:24:32 -05:00
Thomas S Hatch
0f458d7df5 include salt.client.ssh in setup.py 2013-08-29 17:00:24 -06:00
Pedro Algarvio
eb1db5c010 Store salt related path configurations in the distribution object. Fixes #6906.
Added `srv_root_dir` to the paths to check.
2013-08-27 08:46:26 +00:00
Pedro Algarvio
9a4ce0ea9d No more hard-coded salt paths.
All system paths that salt expects and needs are all configurable at install time. This allows for packagers to setup salt's **default** internal paths at build time. For example, under windows, the configuration directory is expected at `c:\salt\conf\`, on FreeBSD at `/usr/local/etc/salt`, etc.

The configurable paths are:

* Salt root directory, `salt_root` in the master and minion configuration files, `--salt-root-dir` option to `python setup.py install`.  Default: `/`
* Salt configuration directory, `--salt-config-dir` option to `python setup.py install`.  Default: `/etc/salt`
* Salt cache directory, `--salt-cache-dir` option to `python setup.py install`.  Default: `/var/cache/salt`
* Salt sock directory, `--salt-sock-dir` option to `python setup.py install`.  Default: `/var/run/salt`
* Salt services root directory, `--salt-srv-root-dir` option to `python setup.py install`.  Default: `/srv`
* Salt base file roots directory, `--salt-base-file-roots-dir` option to `python setup.py install`.  Default: `/srv/salt`
* Salt base pillar roots directory, `--salt-base-pillar-roots-dir` option to `python setup.py install`.  Default: `/srv/pillar`
* Salt base master roots directory, `--salt-base-master-roots-dir` option to `python setup.py install`.  Default: `/srv/salt-master`
* Salt logs directory, `--salt-logs-dir` option to `python setup.py install`.  Default: `/var/log/salt`
* Salt pidfile directory, `--salt-pidfile-dir` option to `python setup.py install`.  Default: `/var/run`
2013-08-25 22:55:57 +00:00
Pedro Algarvio
0288ae6046 Allow salt's paths to be configurable at build time. 2013-08-23 23:58:26 +01:00
Pedro Algarvio
10e635c4d2 Make pylint happy, global variables are all uppercased. 2013-08-23 23:17:13 +01:00
Pedro Algarvio
7f85966cf5 Remove unnecessary variables.
Somewhere along the way salt's setup changed and some variable were left around. Let's remove them.
2013-08-23 23:09:23 +01:00
Thomas S Hatch
363e6a383e Add salt.client to packages 2013-08-08 12:43:06 -06:00
Thomas S Hatch
d1e9d78fd6 Ass salt-ssh into setup.py 2013-07-01 15:52:46 -06:00
Pedro Algarvio
e7c07c8e55 The tests require setup settings can only be addded if setuptools is in use. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
6456934cba Fix the tests require entry in setup. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
3ee3a4796b The salt-testing project changed ownership. Update references. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
3550397b0c Add tests_require to the setup arguments. 2013-06-28 00:12:58 +01:00
Pedro Algarvio
6996afaf46 Work around __file__ NameError thrown by bbfreeze. Fixes #5172. 2013-05-22 02:00:44 +01:00
Pedro Algarvio
0aeb2af20f Add yum to freezer includes if we can actually freeze it, ie, is it available? 2013-05-22 00:45:54 +01:00
Pedro Algarvio
39631427b4 Double to single quotes. 2013-05-22 00:36:31 +01:00
David Boucha
bc83269e41 freeze numbers 2013-05-15 10:16:43 -06:00
Zoran Simic
7d5441e294 Better fix for 'pip' detection in setup.py 2013-03-20 14:05:20 -07:00
Thomas S Hatch
dc2fa7f7ea Remove esky errors because they only confuse %99.99 of users 2013-03-18 14:20:00 -06:00
Pedro Algarvio
52baa13a6d Bring to the developer's attention that a version bump might be missing. 2013-03-14 03:36:50 +00:00
Morgan Fainberg
b9adf48819 Lingering comment removal 2013-02-24 23:29:45 -08:00
Morgan Fainberg
512d9adb8b Fix for "pip" detection so that setuptools is used
If setuptools is not used for PIP installs pip fails to install salt
with a rather nasty error:

error: option --single-version-externally-managed not recognized

from what I can dig up the simple use of:
    if "pip" in __file__

is sufficient to detect pip usage, and should be synonomous
with USE_SETUPTOOLS
2013-02-24 23:19:00 -08:00
Svetlana Shturm
6dac3120a8 Import install command from setuptools if we use them.
This commit fixes bug with option --single-version-externally-managed.
2013-02-13 14:53:39 +04:00
Pedro Algarvio
5730b0bf42 Generate salt._version when installing so we can have the git describe information. Fixes #2587. 2013-02-06 04:23:56 +00:00
anatoly techtonik
f617888bb4 Fix easy_install'ation on Windows
There is no 'wmi' package on PyPI.
2013-02-04 01:14:57 +03:00
Wendall Cada
2ac61215ba Replace hardcoded python executable with sys.executable 2013-01-17 17:05:45 -08:00
Pedro Algarvio
0f5386cb35 Filter Unknown distribution option's when not installing with setuptools. 2013-01-14 13:41:42 +00:00
Aaron Tygart
b50cd76a25 Refine esky support in setup.py
* Add HAS_ESKY flag based on import tests rather than command line
  arguments.
* Add comments on reasoning for some setup kwargs
* Fix append bug for wmi dependency
* Revert part of e70d70aa75. Esky uses
  those kwargs regardless of the distribution stack used.
* Remove unused 'libraries' variable
2013-01-01 16:49:26 -06:00
Pedro Algarvio
3363c43495 Only change to setup.py if not already there. 2012-12-30 18:03:02 +00:00
Pedro Algarvio
e37da07241 Allow running setup.py from any directory. 2012-12-30 17:55:23 +00:00
Thomas S Hatch
13192bbf66 Add fileserver modules to setup.py 2012-12-27 14:09:26 -07:00
Thomas S Hatch
a24de1abb2 Merge pull request #2798 from brutasse/fix/fpm
Filtered the content of requirements.txt
2012-12-04 08:16:49 -08:00
Bruno Renié
aa416583ae Removed the check for comments in requirements parsing 2012-12-04 15:49:40 +01:00
Bruno Renié
c03c83b269 Filtered the content of requirements.txt
This sanitizes what goes into install_requires. External packaging tools such
as FPM fail when they see a requirement starting with '#'.
2012-12-04 15:18:24 +01:00