From 552f60a8f2bbc6068ad7b1da6d99305599d0e830 Mon Sep 17 00:00:00 2001 From: "C. R. Oldham" Date: Fri, 27 Feb 2015 14:41:06 -0700 Subject: [PATCH] Import salt.utils.openstack.pyrax differently to avoid failed import by loader. --- salt/cloud/clouds/pyrax.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/salt/cloud/clouds/pyrax.py b/salt/cloud/clouds/pyrax.py index 9cbea763de..d1c199c36e 100644 --- a/salt/cloud/clouds/pyrax.py +++ b/salt/cloud/clouds/pyrax.py @@ -17,7 +17,10 @@ import salt.utils.cloud import salt.config as config # Import pyrax libraries -import salt.utils.openstack.pyrax as suop +# This is typically against SaltStack coding styles, +# it should be 'import salt.utils.openstack.pyrax as suop'. Something +# in the loader is creating a name clash and making that form fail +from salt.utils.openstack import pyrax as suop # Only load in this module is the OPENSTACK configurations are in place