Commit graph

305 commits

Author SHA1 Message Date
Nico Schottelius
91cf68363b Merge branch 'issue_191' of https://github.com/asteven/cdist 2013-08-20 00:21:36 +02:00
Steven Armstrong
8aacbe2885 Bourne is not bash
see http://shebang.brandonmintern.com/bourne-is-not-bash-or-read-echo-and-backslash/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-08-19 22:25:17 +02:00
Nico Schottelius
975b93c20a fix all tests -> back to normal
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:37:40 +02:00
Nico Schottelius
b527479620 refactor out_path -> base_path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:35:03 +02:00
Nico Schottelius
866645679a throw a better exception when environment variables are missing
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 13:34:29 +02:00
Nico Schottelius
2f5de23ae9 out_path -> base_path
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 12:03:25 +02:00
Nico Schottelius
ffeaa3d06b fix old bug / joining wrong args
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:45:43 +02:00
Nico Schottelius
a76d8bb517 :%s/self.out_path/self.base_path/g
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:45:22 +02:00
Nico Schottelius
8298bb0bf5 fix test cdist.test.config_install.ConfigInstallRunTestCase
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:33:44 +02:00
Nico Schottelius
b3cf339d06 fallback to sys.argv[0] by default
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 11:21:53 +02:00
Nico Schottelius
cd8695d3eb move create_files_dirs more to up - it is similar to init()
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 08:48:41 +02:00
Nico Schottelius
d1708c78b6 refactoring
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 01:38:28 +02:00
Nico Schottelius
eaf1721212 begin to migrate to '--output-base-path', shrink context
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:52:15 +02:00
Nico Schottelius
b9a6cf7c6a remove context from shell
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:38:19 +02:00
Nico Schottelius
a7fe8b4ed2 port context -> remote
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:36:25 +02:00
Nico Schottelius
f79727559a ++logs and migrate context -> local
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:33:58 +02:00
Nico Schottelius
83c981f477 begin to implement -C --cache-dir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-19 00:03:57 +02:00
Nico Schottelius
49d9f1f475 support relative paths in -c argument
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 12:56:54 +02:00
Nico Schottelius
263a8a73a7 minor cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 12:11:43 +02:00
Nico Schottelius
32f878ad00 update docs, document exit code bug
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-12 11:42:00 +02:00
Nico Schottelius
4e46cf8ce4 begin to document shell changes
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 21:12:21 +02:00
Nico Schottelius
79fea569b9 some shell related cleanups
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 20:58:45 +02:00
Nico Schottelius
c793825edb re-arrange REMOTE_COPY/EXEC for Shell use
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 17:52:34 +02:00
Nico Schottelius
2403fc59ee refactor commandline: merge into its own class (and add first shell code)
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-08-07 09:24:10 +02:00
Nico Schottelius
c1441fc676 enhance singleton testing
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 17:21:38 +02:00
Nico Schottelius
8ab760ad90 document unit test
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 17:02:19 +02:00
Nico Schottelius
b84d3393a0 Merge branch 'remove-singleton-object_id' of https://github.com/asteven/cdist 2013-07-10 16:55:41 +02:00
Steven Armstrong
7205cd5ecf remove that crappy old singleton object_id thingy
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2013-07-10 16:31:58 +02:00
Nico Schottelius
ff50a61344 use shortcut version in __package_opkg
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-10 14:16:56 +02:00
Nico Schottelius
dbe65795f5 remove dry_run from object_run
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:27:34 +02:00
Nico Schottelius
5f318d5de3 print warning in case dry run is activated
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:12:49 +02:00
Nico Schottelius
5bad25cd6d add dry_run hint to verbose messages, not debug
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:02:36 +02:00
Nico Schottelius
3c14f7e2f5 add dry run hint
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-05 15:00:23 +02:00
Nico Schottelius
ab50d8561b add new type: __cdist
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-07-04 14:34:17 +02:00
Nico Schottelius
9326adf34b fix refactor error
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-24 13:23:31 +02:00
Nico Schottelius
25bdcb1602 cleanup tests and ... - 100% green
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 22:39:20 +02:00
Nico Schottelius
ef24ec4db8 port test_missing_requirements to config_install unit test
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 21:50:21 +02:00
Nico Schottelius
e1d8645415 fix unit tests for config_install
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 21:48:15 +02:00
Nico Schottelius
4ec1afc47f also remove obsolete save_cache function
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:55:54 +02:00
Nico Schottelius
14a3bf7262 move save_cache into local
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:52:56 +02:00
Nico Schottelius
4758daa037 move types into conf/ dir
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:38:50 +02:00
Nico Schottelius
347ff8900e split directory creating code off of init
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-21 16:35:19 +02:00
Nico Schottelius
b1d661f4c0 merge ResolverTestCase and AutorequireTestCase into ExecutionOrderTestCase
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:30:20 +02:00
Nico Schottelius
b2686f3b13 factor out iterate code to be able to test it for one, two, ... runs
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:24:47 +02:00
Nico Schottelius
c5c5e7b89b remove requirement-finder tests - no need to test assignments and no wildcard support anymore
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 11:17:30 +02:00
Nico Schottelius
4ae241259f remove the old entries on change
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-20 09:20:14 +02:00
Nico Schottelius
d78dc7af8b Merge branch '__cron-simplify' 2013-06-19 21:50:49 +02:00
Nico Schottelius
e7527802a5 more hints for __debconf_set_selections
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:53:07 +02:00
Nico Schottelius
622cd398c6 use quiet mode by default
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:51:23 +02:00
Nico Schottelius
84f2ca0d1f add new type: __update_alternatives
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 18:49:43 +02:00
Nico Schottelius
137856002f Merge branch 'master' into __cron-simplify 2013-06-19 11:31:33 +02:00
Nico Schottelius
4ecffa7d59 fix typo in __process
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 11:31:21 +02:00
Nico Schottelius
fb40ba4d0f Merge branch 'master' into __cron-simplify 2013-06-19 11:20:25 +02:00
Nico Schottelius
135499f120 __process: make --state optional
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 11:19:45 +02:00
Nico Schottelius
1c94c615b1 __cron: remove parameter changing code, remove multiline code, remove early execution of included $() code, simplify __cron
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
2013-06-19 10:55:07 +02:00
Nico Schottelius
1788b343d1 Merge branch '__postgres_role-changes' of https://github.com/nuex/cdist 2013-06-18 13:40:18 +02:00
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