Merge pull request #52 from jaybonci/chef-plugin

Chef plugin

common/tools.py

@@ -1,5 +1,3 @@
-
-
 def log_check_call(command, stdin=None, env=None, shell=False):
 	status, stdout, stderr = log_call(command, stdin, env, shell)
 	if status != 0:
@@ -71,3 +69,21 @@ def config_get(path, config_path):
 	for key in config_path:
 		config = config.get(key)
 	return config
+
+def copy_tree(from_path,to_path):
+	from shutil import copy
+	import os
+	for abs_prefix, dirs, files in os.walk(from_path):
+		prefix = os.path.normpath(os.path.relpath(abs_prefix, from_path))
+		for path in dirs:
+			full_path = os.path.join(to_path, prefix, path)
+			if os.path.exists(full_path):
+				if os.path.isdir(full_path):
+					continue
+				else:
+					os.remove(full_path)
+			os.mkdir(full_path)
+		for path in files:
+			copy(os.path.join(abs_prefix, path),
+			     os.path.join(to_path, prefix, path))
+

plugins/chef/__init__.py

@@ -0,0 +1,14 @@
+import tasks
+
+
+def validate_manifest(data, validator, error):
+	import os.path
+	schema_path = os.path.normpath(os.path.join(os.path.dirname(__file__), 'manifest-schema.json'))
+	validator(data, schema_path)
+
+
+def resolve_tasks(taskset, manifest):
+	taskset.add(tasks.AddPackages)
+	if 'assets' in manifest.plugins['chef']:
+		taskset.add(tasks.CheckAssetsPath)
+		taskset.add(tasks.CopyChefAssets)

plugins/chef/manifest-schema.json

@@ -0,0 +1,26 @@
+{
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"title": "Puppet plugin manifest",
+	"type": "object",
+	"properties": {
+		"plugins": {
+			"type": "object",
+			"properties": {
+				"chef": {
+					"type": "object",
+					"properties": {
+						"assets": { "$ref": "#/definitions/absolute_path" }
+					},
+					"minProperties": 1,
+					"additionalProperties": false
+				}
+			}
+		}
+	},
+	"definitions": {
+		"absolute_path": {
+			"type":    "string",
+			"pattern": "^/[^\\0]+$"
+		}
+	}
+}

plugins/chef/tasks.py

@@ -0,0 +1,40 @@
+from base import Task
+from common import phases
+from common.tasks import apt
+import os
+
+
+class CheckAssetsPath(Task):
+	description = 'Checking whether the assets path exist'
+	phase = phases.preparation
+
+	@classmethod
+	def run(cls, info):
+		from common.exceptions import TaskError
+		assets = info.manifest.plugins['chef']['assets']
+		if not os.path.exists(assets):
+			msg = 'The assets directory {assets} does not exist.'.format(assets=assets)
+			raise TaskError(msg)
+		if not os.path.isdir(assets):
+			msg = 'The assets path {assets} does not point to a directory.'.format(assets=assets)
+			raise TaskError(msg)
+
+
+class AddPackages(Task):
+	description = 'Add chef package'
+	phase = phases.preparation
+	predecessors = [apt.AddDefaultSources]
+
+	@classmethod
+	def run(cls, info):
+		info.packages.add('chef')
+
+
+class CopyChefAssets(Task):
+	description = 'Copying chef assets'
+	phase = phases.system_modification
+
+	@classmethod
+	def run(cls, info):
+		from common.tools import copy_tree
+		copy_tree(info.manifest.plugins['chef']['assets'], os.path.join(info.root, 'etc/chef'))

plugins/puppet/tasks.py

@@ -53,22 +53,8 @@ class CopyPuppetAssets(Task):
 
 	@classmethod
 	def run(cls, info):
-		from shutil import copy
+		from common.tools import copy_tree
-		puppet_path = os.path.join(info.root, 'etc/puppet')
+		copy_tree(info.manifest.plugins['puppet']['assets'], os.path.join(info.root, 'etc/puppet'))
-		puppet_assets = info.manifest.plugins['puppet']['assets']
-		for abs_prefix, dirs, files in os.walk(puppet_assets):
-			prefix = os.path.normpath(os.path.relpath(abs_prefix, puppet_assets))
-			for path in dirs:
-				full_path = os.path.join(puppet_path, prefix, path)
-				if os.path.exists(full_path):
-					if os.path.isdir(full_path):
-						continue
-					else:
-						os.remove(full_path)
-				os.mkdir(full_path)
-			for path in files:
-				copy(os.path.join(abs_prefix, path),
-				     os.path.join(puppet_path, prefix, path))
 
 
 class ApplyPuppetManifest(Task):