add run_list and initial_attributes conditionally

deis · Jul 25, 2013 · 9bb3638 · 9bb3638
1 parent d6ee9e9
commit 9bb3638
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/api/models.py b/api/models.py
@@ -537,9 +537,10 @@ def _prepare_launch_args(self):
             chef['validation_name'] = settings.CHEF_VALIDATION_NAME
             chef['validation_key'] = settings.CHEF_VALIDATION_KEY
             chef['node_name'] = self.id
-            # use the layer's run list
-            chef['run_list'] = self.layer.run_list
-            chef['initial_attributes'] = self.layer.initial_attributes
+            if self.layer.run_list:
+                chef['run_list'] = self.layer.run_list
+            if self.layer.initial_attributes:
+                chef['initial_attributes'] = self.layer.initial_attributes
         # add the formation's ssh pubkey
         init.setdefault('ssh_authorized_keys', []).append(
                                 self.formation.ssh_public_key)