Merge pull request #25575 from rallytime/scaleway_fix

Make Sure Scaleway driver works with deprecation paths
saltstack · Jul 21, 2015 · 760955c · 760955c
2 parents cf317b4 + f9e5317
commit 760955c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/salt/cloud/clouds/scaleway.py b/salt/cloud/clouds/scaleway.py
@@ -199,14 +199,19 @@ def create(server_):
     except AttributeError:
         pass
 
+    # Since using "provider: <provider-engine>" is deprecated, alias provider
+    # to use driver: "driver: <provider-engine>"
+    if 'provider' in server_:
+        server_['driver'] = server_.pop('provider')
+
     salt.utils.cloud.fire_event(
         'event',
         'starting create',
         'salt/cloud/{0}/creating'.format(server_['name']),
         {
             'name': server_['name'],
             'profile': server_['profile'],
-            'provider': server_['provider'],
+            'provider': server_['driver'],
         },
         transport=__opts__['transport']
     )
@@ -381,7 +386,7 @@ def __query_node_data(server_name):
         {
             'name': server_['name'],
             'profile': server_['profile'],
-            'provider': server_['provider'],
+            'provider': server_['driver'],
         },
         transport=__opts__['transport']
     )

diff --git a/salt/config.py b/salt/config.py
@@ -2399,8 +2399,8 @@ def is_profile_configured(opts, provider, profile_name):
     alias, driver = provider.split(':')
 
     # Most drivers need a size, but some do not.
-    non_size_drivers = ['opennebula', 'parallels', 'softlayer', 'softlayer_hw',
-                        'vmware', 'vsphere']
+    non_size_drivers = ['opennebula', 'parallels', 'scaleway', 'softlayer',
+                        'softlayer_hw', 'vmware', 'vsphere']
 
     if driver not in non_size_drivers:
         required_keys.append('size')