saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update scaleway cloud provider to manage x86 servers

Browse source
This commit is contained in:
Nicolas Morin 2016-03-14 23:37:01 +01:00
parent d357e4ea44
commit 1662a080e1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/cloud/clouds/scaleway.py
View file

@ -237,10 +237,15 @@ def create(server_):
'access_key', get_configured_provider(), __opts__, search_global=False
)
commercial_type = config.get_cloud_config_value(
'commercial_type', server_, __opts__, default='C1'
)
kwargs = {
'name': server_['name'],
'organization': access_key,
'image': get_image(server_),
'commercial_type': commercial_type,
}
salt.utils.cloud.fire_event(
@ -331,7 +336,7 @@ def query(method='servers', server_id=None, command=None, args=None,
get_configured_provider(),
__opts__,
search_global=False,
default='https://api.scaleway.com'
default='https://api.cloud.online.net'
))
path = '{0}/{1}/'.format(base_path, method)
@ -360,7 +365,7 @@ def query(method='servers', server_id=None, command=None, args=None,
raise SaltCloudSystemExit(
'An error occurred while querying Scaleway. HTTP Code: {0} '
'Error: {1!r}'.format(
request.getcode(),
request.status_code,
request.text
)
)