Merge pull request #8384 from s0undt3ch/develop

Don't let Salt fail because `libcloud` is not installed.

salt/cloud/cli.py

@@ -28,7 +28,11 @@ import salt.cloud
 import salt.cloud.config
 from salt.cloud.utils import parsers
 from salt.cloud.exceptions import SaltCloudException, SaltCloudSystemExit
-from salt.cloud.libcloudfuncs import libcloud_version
+try:
+    from salt.cloud.libcloudfuncs import libcloud_version
+    HAS_LIBCLOUD = True
+except ImportError:
+    HAS_LIBCLOUD = False
 
 
 log = logging.getLogger(__name__)
@@ -39,6 +43,9 @@ class SaltCloud(parsers.SaltCloudParser):
         '''
         Execute the salt-cloud command line
         '''
+        if HAS_LIBCLOUD is False:
+            self.error('salt-cloud requires >= libcloud 0.11.4')
+
         libcloud_version()
 
         # Parse shell arguments