bug fixes

arista-eosplus · Feb 9, 2015 · 13ff740 · 13ff740
1 parent 9d49680
commit 13ff740
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/actions/run_bash_script b/actions/run_bash_script
@@ -52,10 +52,10 @@ def main(attributes):
           -
             action: run_bash_script
             attributes:
-              url: files/templates/ma1.template
+              url: files/scripts/install_script
               variables:
                 version: 1.2.3
-            name: "install temp package"
+            name: 'install temp package'
     '''
 
     node = attributes.get('NODE')

diff --git a/actions/run_cli_commands b/actions/run_cli_commands
@@ -55,7 +55,7 @@ def main(attributes):
               url: files/templates/ma1.template
               variables:
                 ipaddress: allocate('mgmt_subnet')
-            name: "configure ma1"
+            name: 'configure ma1'
     '''
 
     node = attributes.get('NODE')
@@ -81,14 +81,16 @@ def main(attributes):
         raise Exception('Unable to perform variable substitution - '
                         'invalid variables')
 
+
     contents = node.substitute(contents, variables)
+    commands = [x for x in contents.split('\n') if x]
 
     try:
-        node.api_enable_cmds(contents.split('\n'),
+        node.api_enable_cmds(commands,
                              text_format=True)
     except Exception as exc:
-        raise Exception('Running CLI commands failed: %s' % 
-                        exc.message)
+        raise Exception('Running CLI commands %s failed: %s' % 
+                        (commands, exc.message))
 
     # Only remove this in case everything else succeeded
     # for debugging purposes