Commit graph

249 commits

Author SHA1 Message Date
nuex
90f7ec40fe __postgres_database: make state parameter optional 2013-06-17 13:49:36 -04:00
nuex
48b6344645 __postgres_role: check if state parameter exists before reading it 2013-06-17 11:16:26 -04:00
nuex
dc39099730 __postgres_role: make state parameter optional, fix password parameter checking in gencode-remote 2013-06-17 11:05:23 -04:00
nuex
211363d5be __git: quote variables in gencode-remote, add optional parameters in manpage 2013-06-16 01:40:11 -04:00
Nico Schottelius
2acce10497 change __start_on_boot to use systemd on archlinux
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-09 23:45:22 +02:00
Nico Schottelius
68d4bcbcb4 begin to fix syntax errors of merge
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-03 15:05:43 +02:00
Nico Schottelius
3d73cd2fd3 better debugging for wrong type, fix emulator tests, fixes #176
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-27 16:36:20 +02:00
Tyler Akins
1485381340 Fixing apt_ppa type - can't use double equals with dash 2013-05-26 15:54:28 -05:00
Nico Schottelius
51c8687455 re-add object_prepare, use new run() method
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 10:08:23 +02:00
Nico Schottelius
ae8040536f mere tests of autorequire and resolver into execution_order
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:26:48 +02:00
Nico Schottelius
03bd44e135 Merge branch 'execution_order_plus_general_changes' 2013-05-15 09:19:52 +02:00
Nico Schottelius
a9ffa86b74 remove some old code, merge run into deploy_and_cleanup
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:19:36 +02:00
Nico Schottelius
72fef03184 Merge branch 'execution_order' into execution_order_plus_general_changes 2013-05-15 09:16:59 +02:00
Nico Schottelius
0b4914a7f3 +comment wording
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-15 09:16:52 +02:00
Nico Schottelius
e771e91043 Merge branch '__ssh_authorized_keys' of https://github.com/asteven/cdist 2013-05-10 13:13:13 +02:00
Steven Armstrong
d4bad031e9 bugfix: the parameter is named 'state' not 'present'
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-05-10 12:41:56 +02:00
Steven Armstrong
d72afd3903 dont change parameters; dont use tmpfile; update copyright
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-05-10 12:35:22 +02:00
Nico Schottelius
a265d87037 begin dry run in command line
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-05-02 16:41:16 +02:00
Nico Schottelius
f95052e56f remove unused modules
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:18:03 +02:00
Nico Schottelius
4882c2cf19 --resolver in config_install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:16:38 +02:00
Nico Schottelius
956f400da6 re-arrange for future cleanup
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:15:22 +02:00
Nico Schottelius
2dac681f25 better error message
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:07:59 +02:00
Nico Schottelius
85d24ce259 fix execution order - seems to be fine now
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 15:07:27 +02:00
Nico Schottelius
8a7c64f86a cleanups + indent errors
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 11:04:01 +02:00
Nico Schottelius
a064cc19b3 try new object orientated (hrrr) code instead of stage based
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-30 10:58:23 +02:00
Nico Schottelius
002537f5d1 Merge pull request #169 from arkaitzj/global_explorers
Make global explorers available to initial manifest
2013-04-09 06:11:07 -07:00
Nico Schottelius
af75aa9024 use chmod to allow chmod being in a different path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-08 19:58:22 +02:00
Arkaitz Jimenez
9dcad37acf Remove the umask requirement, set the proper permissions to base_path 2013-04-08 19:58:21 +02:00
Nico Schottelius
5152bdfce7 add hint for 0700, root:root behaviour of __directory --parents
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-04-03 16:49:03 +02:00
Nico Schottelius
352c7da46c quote the new value check - may contains spaces
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-04-02 09:21:01 +02:00
Nico Schottelius
dd566527a9 Merge branch 'user_create_home' of https://github.com/arkaitzj/cdist 2013-04-02 09:19:58 +02:00
Arkaitz Jimenez
4a89e64115 Make global explorers available to initial manifest and fix hostname explorer 2013-04-01 00:48:57 +02:00
Arkaitz Jimenez
60f85c5b85 __user support for --create-home 2013-04-01 00:02:22 +02:00
Arkaitz Jimenez
d59953642e crontab -l should be allowed to fail with "no crontab" without stopping exec 2013-04-01 00:01:22 +02:00
Nico Schottelius
44a0f5d7bb restore resolver test
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-22 11:13:44 +01:00
Nico Schottelius
a59fa92246 Merge remote-tracking branch 'jake/__directory_fix' 2013-02-21 22:25:18 +01:00
Jake Guffey
a1fb621d19 Merge branch 'master' into __directory_fix 2013-02-20 08:19:46 -05:00
Jake Guffey
a50830dca8 Use $__explorer to get os type 2013-02-19 16:31:06 -05:00
Jake Guffey
9f330e361d Added support for multiple IP addresses
FreeBSD jails support jail_${name}_ip="iface1|addr1, iface2|addr2" format for specifying multiple IP addresses
2013-02-19 16:24:22 -05:00
Jake Guffey
52fdf15a4b Add umask
Some directories were being created 700 and causing problems, added umask 022 to fix this
2013-02-19 15:28:03 -05:00
Jake Guffey
005c94556e Fix to support FreeBSD's stat(1)
Added check for OS type
Added FreeBSD syntax in case of $os=freebsd
2013-02-19 15:23:52 -05:00
Nico Schottelius
177c350747 use self.context, not self.local
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-14 15:45:58 +01:00
Nico Schottelius
d1e06504a2 merge back the dependency resolver into pseudo master
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-14 15:28:40 +01:00
Steven Armstrong
06fb7491fa prevent requirements from leaking into autorequired objects and creating circular references
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

Conflicts:
	cdist/test/autorequire/__init__.py
2013-02-14 15:23:04 +01:00
Nico Schottelius
cb829ec8d0 introduce MissingObjectIdError
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-02-05 22:50:22 +01:00
Nico Schottelius
3b430c0d76 Merge pull request #156 from contradict/__git_permissions
__git respects --owner and --group, add --mode
2013-01-31 13:06:09 -08:00
Nico Schottelius
c620c2fa29 Merge pull request #155 from statianzo/directory-owner
Set permissions on existing directory
2013-01-31 13:05:10 -08:00
b772e09d53 Exit with no error if directory absent
Explorers need to handle the case of no directory.
2013-01-30 00:48:08 -08:00
Jason Staten
919707d6f9 Initialize variables to empty string
Set mode, group, etc. to an empty string to ensure that no external
environment variables can leak in.
2013-01-28 10:06:04 -07:00
Eivind Uggedal
1b25ef33b9 Slackware os and os_version explorer support. 2013-01-28 08:30:54 -05:00
3ff7621984 __git respects --owner and --group, add --mode
After checkout, chown and chmod as specified. If already present, but
not possessing correct permissions, run chown and chmod as needed.
2013-01-27 19:53:22 -08:00
Jason Staten
fc1a9ed27b directory permission explorers
The group, mode, and owner are now pulled from a explorers. If the
desired value matches the existing value, then no code is executed.

If the recursive flag is set, the permissions are applied every run.
2013-01-24 22:37:52 -07:00
Nico Schottelius
1d933dd5d3 do not need to create directories - git will do this - thanks to Steven
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2013-01-20 22:02:10 +01:00
Jason Staten
f16ac1911d Set permissions on existing directory
Previously, an existing directory would not have its permissions
modified by the __directory type. This change removes exiting early when
$state_is matches $state_should
2013-01-16 20:46:23 -07:00
f41b029ade Eliminiate excess output from machine explorer
command -v emits a string to stdout, silence this since we are only
interested in the return code.
2013-01-12 19:35:09 -08:00
Nico Schottelius
e03f5d08dd move / correct tests in object and config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:14:23 +01:00
Nico Schottelius
ef45cd5ce0 fix removal of context alias in config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:14:07 +01:00
Nico Schottelius
2732a4ba5c finally finish the dynamic resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 21:10:18 +01:00
Nico Schottelius
527ec0889b remove unneeded fixtures
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 20:53:38 +01:00
Nico Schottelius
4fd27e76a7 support dry_run in stage_run_iterate as well
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 19:37:43 +01:00
Nico Schottelius
c270538072 add dry_run option to object_run
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 19:36:00 +01:00
Nico Schottelius
eb93d1bebd begin tests for config_install
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 15:33:50 +01:00
Nico Schottelius
369305f376 remove circularreferenceerror, because it is not being used anymore
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-19 15:33:41 +01:00
Nico Schottelius
8031c77700 fix some tests, break some others :-)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 18:21:51 +01:00
Nico Schottelius
4faec43493 cleanup: remove call to old resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 17:37:07 +01:00
Nico Schottelius
958d2d336f various cleanups
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-18 17:16:26 +01:00
Nico Schottelius
442dc767dd merge resolver test into object test - because object requirement solving is implemented
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-16 12:55:36 +01:00
Nico Schottelius
cd8b3cf68d finish rewrite of dependency resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-16 12:47:13 +01:00
Nico Schottelius
6a8778e595 remove most of the resolver boilerplate, keep the interesting functions
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:43:52 +01:00
Nico Schottelius
81c92e5cc4 merge all resolver code into cdist_object (to gain the requirement searching code
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:41:56 +01:00
Nico Schottelius
16340b7d34 report on broken requirements, begin to satisfy requirements
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-14 08:41:17 +01:00
Nico Schottelius
6b6037d9bb todos for a simple resolver
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-13 06:44:55 +01:00
Nico Schottelius
2e81379c18 add very simple solver for dependencies
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-13 06:41:33 +01:00
Jake Guffey
7d7ad2630c Fix issue #147
--state absent should imply --stopped.
2012-12-11 11:15:21 -05:00
Nico Schottelius
67c7351bec install the right package, not pyro...
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-09 11:49:26 -08:00
Nico Schottelius
3167ececc6 add owner/group support to __git
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-05 23:16:03 +01:00
Nico Schottelius
8b91e3116a create working version of __git
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-12-05 23:07:21 +01:00
Nico Schottelius
5a3dc38e60 Merge branch 'master' into type__git 2012-12-05 22:46:07 +01:00
Steven Armstrong
56b6c95ed4 implement conf-dir from CDIST_PATH environment variable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 16:46:17 +01:00
Nico Schottelius
f37f3d201c __ssh_authorized_key has been superseeded by __ssh_authorized_keys
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-30 14:41:47 +01:00
Steven Armstrong
1ef5bcaa74 new type: __ssh_authorized_keys - manage ssh authorized_keys files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 11:59:38 +01:00
Steven Armstrong
3a419ed58b make type explorers executable after transfering them
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-30 10:31:15 +01:00
Nico Schottelius
868421bf16 Update examples to match new parameters
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-30 10:01:37 +01:00
Nico Schottelius
1bd27fffae __jail: started -> stopped, correct help output
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-27 10:57:10 +01:00
Nico Schottelius
fd8fdf8b54 Merge branch 'master' into type__jail_boolean 2012-11-27 08:58:14 +01:00
Nico Schottelius
8bf196fdc0 add helpful log message when resolving dependencies
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-20 22:41:38 +01:00
Nico Schottelius
b996dcbae1 bugfix __qemu_img
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:42:39 +01:00
Nico Schottelius
8408f433e9 remove type from here - goes into cdist-nico repo
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:27:35 +01:00
Nico Schottelius
a6452cfabd rename type to reflect new environment
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:24:38 +01:00
Nico Schottelius
3dfad32d4c add new type: __localch_kvm_vm
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 17:24:01 +01:00
Nico Schottelius
2fe647a1f7 Revert "implement before/after to declare dependencies and deprecate require"
Comment from asteven:
    Some problems showed up while updating the docs and tests.
    You should revert the merge for now.

This reverts commit 84770b9ef2.
2012-11-19 15:17:46 +01:00
Nico Schottelius
d4fc49fa6b begin manpage
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 15:13:57 +01:00
Nico Schottelius
d419722a24 adapt documentation to use boolean parameter as well
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 13:43:45 +01:00
Nico Schottelius
bb19902581 Merge branch 'master' into type__jail_boolean 2012-11-19 13:40:59 +01:00
Nico Schottelius
4718b81a08 Documentation cleanup (old pre-boolean variant)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2012-11-19 13:40:35 +01:00
Nico Schottelius
67545eda79 Merge remote-tracking branch 'steven/issue_140' 2012-11-19 13:35:21 +01:00
Nico Schottelius
4ab51df2c8 Merge pull request #139 from asteven/2.1_before-after
implement before/after to declare dependencies and deprecate require
2012-11-19 04:27:09 -08:00
Nico Schottelius
4e3bab81d5 Merge pull request #138 from asteven/issue_138
file from stdin is broken
2012-11-19 04:17:43 -08:00
Steven Armstrong
7f0ae7928a fix state explorer to properly detect already existing ppa
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-19 13:05:23 +01:00
Steven Armstrong
84770b9ef2 implement before/after to declare dependencies and deprecate require
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

--whitespace

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2012-11-19 12:29:49 +01:00