combine all apt-calls

dask · Feb 10, 2017 · 765fdcb · 765fdcb
1 parent ecc0043
commit 765fdcb
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/dask_ec2/salt.py b/dask_ec2/salt.py
@@ -150,16 +150,16 @@ def __setup_salt_master():
             e.last_exception)
 
     @retry(retries=3, wait=0)
-    def __install_python_pip():
-        cmd = "apt-get install -y python-pip"
+    def __apt_installs():
+        cmd = "apt-get install -y python-pip libssl-dev libffi-dev python-dev"
         ret = master.exec_command(cmd, sudo=True)
         if ret["exit_code"] != 0:
             raise Exception(ret["stderr"].decode('utf-8'))
 
     try:
-        __install_python_pip()
+        __apt_installs()
     except RetriesExceededException as e:
-        raise DaskEc2Exception("%s\nCouldn't install python-pip. Error is above (maybe try again)" %
+        raise DaskEc2Exception("%s\nCouldn't install ubuntu dependencies. Error is above (maybe try again)" %
                                e.last_exception)
 
     @retry(retries=3, wait=0)
@@ -191,7 +191,7 @@ def __install_salt_rest_api():
 
     @retry(retries=3, wait=0)
     def __install_pyopensll():
-        cmd = "apt-get install libssl-dev libffi-dev python-dev -y; pip install PyOpenSSL==16.2.0"
+        cmd = "pip install PyOpenSSL==16.2.0"
         ret = master.exec_command(cmd, sudo=True)
         if ret["exit_code"] != 0:
             raise Exception(ret["stderr"])