From 8ddbfc0789c2b88b800addc7be15f4dc1f262df5 Mon Sep 17 00:00:00 2001
From: "Vladmir Sharhsov(warpc)" <vsharshov@gmail.com>
Date: Mon, 15 Jul 2013 12:36:41 +0400
Subject: [PATCH] Remove unused attribute for provision operations. Astute
 console client no more required it for such things.

---
 bin/astute                          | 17 +++++++++--------
 examples/example_provision_env.yaml |  1 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/astute b/bin/astute
index 20223cbe..bd923be4 100755
--- a/bin/astute
+++ b/bin/astute
@@ -62,15 +62,16 @@ Astute.logger = Logger.new(STDOUT) if opts[:verbose]
 
 environment = YAML.load_file(opts[:filename])
 
-case environment['attributes']['deployment_engine']
-  when 'nailyfact'
-    deploy_engine = Astute::DeploymentEngine::NailyFact
-  when 'simplepuppet'
-    deploy_engine = Astute::DeploymentEngine::SimplePuppet  # It just calls puppet and doesn't do any magic
-  else
-    deploy_engine = nil  # Orchestrator will use it's default
-end
+deploy_engine = nil
 
+if environment['attributes'] && environment['attributes']['deployment_engine']
+  case environment['attributes']['deployment_engine']
+    when 'nailyfact'
+      deploy_engine = Astute::DeploymentEngine::NailyFact
+    when 'simplepuppet'
+      deploy_engine = Astute::DeploymentEngine::SimplePuppet  # It just calls puppet and doesn't do any magic
+  end
+end
 
 if [:deploy, :fast_provision, :provision].include? opts[:command]
   orchestrator = Astute::Orchestrator.new(deploy_engine, log_parsing=false)
diff --git a/examples/example_provision_env.yaml b/examples/example_provision_env.yaml
index fdd3bc72..775353dc 100644
--- a/examples/example_provision_env.yaml
+++ b/examples/example_provision_env.yaml
@@ -2,7 +2,6 @@
 task_uuid: deployment_task
 
 attributes:
-  deployment_engine: simplepuppet
 
 engine:
   url: http://localhost/cobbler_api