valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #21135 from cro/ugly_pyrax_error2

Browse Source 
Import salt.utils.openstack.pyrax differently to avoid failed import by loader
This commit is contained in:
jfindlay 2015-02-27 16:22:32 -07:00
commit 02d3b3e64c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/cloud/clouds/pyrax.py
View File

@ -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