Commit Graph

37 Commits

Author SHA1 Message Date
Colton Myers
7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-08-03 14:30:07 -06:00
Jorge Schrauwen
ebb63f15a6 create log directory for smartos esky package 2015-07-31 16:34:02 +00:00
Colton Myers
e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/changelog
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/cloud/clouds/proxmox.py
    salt/cloud/clouds/vmware.py
    salt/config.py
    salt/fileclient.py
    salt/minion.py
    salt/modules/chocolatey.py
    salt/modules/localemod.py
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/schedule.py
    salt/modules/state.py
    salt/modules/win_file.py
    salt/modules/win_pkg.py
    salt/state.py
    salt/states/file.py
    salt/utils/args.py
    tests/unit/states/file_test.py
2015-07-30 16:54:44 -06:00
Jorge Schrauwen
937779eb51 patchelf lives in pkgsrc
alteast on base-64-lts 14.4.0 release
2015-07-28 10:03:20 -06:00
Jorge Schrauwen
c825683363 cleanup of python requirements
halite is deprecated, could requirements file got removed so importing it fails in the until loops.
2015-07-27 09:04:23 -06:00
Colton Myers
99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/man/salt-call.1
    doc/man/salt-cloud.1
    doc/man/salt-cp.1
    doc/man/salt.7
    salt/cloud/__init__.py
    salt/fileclient.py
    salt/modules/file.py
    salt/modules/gpg.py
2015-06-29 16:49:40 -06:00
Colton Myers
8d8bf3476f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-24 11:12:15 -06:00
Bret Fisher
d7bfb0c7fd Smartos smf minion fix
Per my own testing on dozens of SmartOS VM's and issue #473 "Problem
3", the salt-minion service manifest definition doesn't work. This
change fixes that. I think it may have broke in 2014.7 so back porting
to that ver.
2015-06-23 22:34:07 -04: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
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Nahum Shalman
a51a90c128 SmartOS Esky: pkgsrc 2014Q4 Build Environment
Need to clean up /var/db/pkgin
Need to install mysql-client explicitly
libzmq seems to link against libsodium... drag it along.
2015-04-02 11:27:22 -04:00
Colton Myers
8bba4bbec4 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/cloud/clouds/msazure.py
	salt/modules/boto_sns.py
	salt/states/boto_sns.py
	tests/integration/modules/boto_sns.py
	tests/integration/states/boto_sns.py
2015-01-23 14:20:34 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
2015-01-22 16:46:32 -07:00
Nahum Shalman
32c222f8f2 SmartOS Esky: fix build version identification
"bdist" doesn't do the right thing in the absence of
version files produced by "sdist".
Run "sdist" then extract out the contents of the tarball
into place
2015-01-21 20:06:48 -05:00
Justin Findlay
ad33589fac move requirements files into requirements dir 2014-12-27 17:29:03 -07:00
Pedro Algarvio
781092daaa Merge branch '2014.7' into develop 2014-09-11 22:42:04 +01:00
Nahum Shalman
adc71a4de9 SmartOS esky: build needs to invoke sdist
per saltstack/salt#15405
2014-09-10 16:29:13 -04:00
Thomas S Hatch
0004ff8898 Merge branch '2014.7' into develop 2014-09-09 11:20:29 -06:00
Nahum Shalman
aa0e7209c5 SmartOS Esky: Fix minion SMF manifest
Some users reported an errror that SMF couldn't find auditconfig despite
the fact that the PATH is set correctly. Invoking with the full path
seems to fix the issue.
2014-09-08 16:07:48 -04:00
Mike Place
be60e25574 Merge branch '2014.7' into develop 2014-09-02 13:56:54 -06:00
Nahum Shalman
df7736b530 SmartOS esky: fix odd problem with zeromq linking 2014-09-01 12:50:07 -04:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
2014-08-25 13:29:29 -06:00
Chris Rebert
fcc41721fd sodium_grabber_installer: fix kwarg spacing
************* Module sodium_grabber_installer
pkg/smartos/esky/sodium_grabber_installer.py:16: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    sources = [path.join(HERE, 'sodium_grabber.c')],
            ^
pkg/smartos/esky/sodium_grabber_installer.py:17: [C0326(bad-whitespace), ] No space allowed around keyword argument assignment
    libraries = ['sodium'],
              ^
2014-08-22 12:04:34 -07:00
Nahum Shalman
d0dac42958 SmartOS esky build environment instructions cleanup 2014-08-21 17:37:55 -04:00
Nahum Shalman
cdae8948a1 SmartOS esky packaging of 2014.7
Resulting builds can be used either with zeromq or with raet
2014-08-21 16:01:46 -04:00
Nahum Shalman
7a0044a8f5 SmartOS Esky: py27-mysqldb in build environment
Requested by @johngrasty
2014-08-04 16:15:17 -04:00
Nahum Shalman
7fbe259eea SmartOS esky build: requirements files
Mimicking the breakout of requirements files in the main project,
this allows me to keep a file of extra requirements that get put in the
esky (e.g. halite) while only needing to point the build process at
either the zeromq or raet requirements file.
2014-07-09 17:49:46 -04:00
Matthieu Guegan
49419f94c3 Add a method context environment PATH
Some modules are referring to PATH env variable which do not contains /opt/local/.. paths by default. This fix provides correct PATH handling
2014-06-22 11:38:35 +02:00
Nahum Shalman
3e5742bb73 SmartOS: run salt minion in an audit context
This fixes an issue @njones11 was having with
multiple cron.present states.

"crontab -l <username>" would fail, so the temp file
would be empty, a given cronjob would go in
and then the "su - <username> crontab <temp file>" would
succeed.

This evaded debugging attempts because if you invoked the salt
minion manually from a login shell, an audit context would
already exist and the "crontab -l <username>" would succeed.

The hint was a message in the debug log of:
[ERROR   ] Command 'crontab -l legion' failed with return code: 1
[ERROR   ] stderr: crontab: The audit context for your shell has not
been set.

We explicitly set up an audit context when launching the salt minion
which allows "crontab -l <username>" to succeed.

This may fix other issues and something similar
should perhaps be applied to pkg/smartos/salt-minion.xml

"5417" was chosen arbitrarily
2014-06-19 16:11:49 -04:00
Nahum Shalman
6af019d7cf smartos esky: improve "installer"
detect if this is a global or non-global zone
global zones are always minions

if the user passes in the name/address of the master
we configure a minimal minion file and launch the minion
2014-05-08 12:04:22 -04:00
Nahum Shalman
e62862f992 update documentation about SmartOS esky packaging 2014-02-25 19:27:39 -05:00
Nahum Shalman
3c179c2a41 SmartOS esky packaging: minor fixup
Don't assume that the top directory is named "salt"
The user might choose to name it "salt-<version>"
or "saltstack" or whatever else.

install.sh is already that flexible; this fixes _syspaths.py
2014-01-24 09:47:37 -05:00
Nahum Shalman
9f2a19ef05 SmartOS Esky Packaging: Fix PATH for services
We ran into some weird issues with these SMF manifests
with certain critical binaries not being found in the PATH.

This PATH is derived from root's default PATH when logging
in to a SmartOS zone.
2014-01-23 15:31:44 -05:00
Nahum Shalman
e94f42449a SmartOS esky build tooling
This includes:
Notes on how I created a build environment
The _syspaths.py that allows the esky build to be installed anywhere
"Template" SMF manifests and an install script to import them
A script for building both the esky zip and a deployable tarball
2014-01-05 11:20:24 -05:00
mguegan
8ba8138bc4 pkg/smartos : fix the manifest of salt-master to start@boot 2013-05-30 20:33:16 +02:00
mguegan
89de6a1606 smartos : change default config directory for Salt services 2013-05-20 13:00:38 +02:00
mguegan
737b4e0fb2 pkg/smartos : add compatible manifests for the SmartOS platform
Manifests in pkg/solaris are using /etc/salt which is innapropriate
for SmartOS design (/etc is removed @reboot). I suggest to add a
new directory in order to preserve existing Solaris installations
(and SmartOS one which are based on those manifests).
2013-05-13 22:17:35 +02:00