From a12f9998cad83989eb5ed659346800911056c24d Mon Sep 17 00:00:00 2001
From: Jack Ivanov <e601809@gmail.com>
Date: Thu, 15 Aug 2019 12:29:22 +0200
Subject: [PATCH] Scaleway and Lightsail fixes

---
 ansible.cfg                          |  1 +
 library/scaleway_compute.py          | 49 +---------------------------
 roles/cloud-lightsail/tasks/main.yml |  2 +-
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/ansible.cfg b/ansible.cfg
index f6b2978..2216133 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -6,6 +6,7 @@ host_key_checking = False
 timeout = 60
 stdout_callback = default
 display_skipped_hosts = no
+force_valid_group_names = ignore
 
 [paramiko_connection]
 record_host_keys = False
diff --git a/library/scaleway_compute.py b/library/scaleway_compute.py
index 8aa6ce4..d36ba09 100644
--- a/library/scaleway_compute.py
+++ b/library/scaleway_compute.py
@@ -88,26 +88,6 @@ options:
     description:
     - Commercial name of the compute node
     required: true
-    choices:
-      - ARM64-2GB
-      - ARM64-4GB
-      - ARM64-8GB
-      - ARM64-16GB
-      - ARM64-32GB
-      - ARM64-64GB
-      - ARM64-128GB
-      - C1
-      - C2S
-      - C2M
-      - C2L
-      - START1-XS
-      - START1-S
-      - START1-M
-      - START1-L
-      - X64-15GB
-      - X64-30GB
-      - X64-60GB
-      - X64-120GB
 
   wait:
     description:
@@ -161,33 +141,6 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six.moves.urllib.parse import quote as urlquote
 from ansible.module_utils.scaleway import SCALEWAY_LOCATION, scaleway_argument_spec, Scaleway
 
-SCALEWAY_COMMERCIAL_TYPES = [
-
-    # Virtual ARM64 compute instance
-    'ARM64-2GB',
-    'ARM64-4GB',
-    'ARM64-8GB',
-    'ARM64-16GB',
-    'ARM64-32GB',
-    'ARM64-64GB',
-    'ARM64-128GB',
-
-    # Baremetal
-    'C1',  # ARM64 (4 cores) - 2GB
-    'C2S',  # X86-64 (4 cores) - 8GB
-    'C2M',  # X86-64 (8 cores) - 16GB
-    'C2L',  # x86-64 (8 cores) - 32 GB
-
-    # Virtual X86-64 compute instance
-    'START1-XS',  # Starter X86-64 (1 core) - 1GB - 25 GB NVMe
-    'START1-S',  # Starter X86-64 (2 cores) - 2GB - 50 GB NVMe
-    'START1-M',  # Starter X86-64 (4 cores) - 4GB - 100 GB NVMe
-    'START1-L',  # Starter X86-64 (8 cores) - 8GB - 200 GB NVMe
-    'X64-15GB',
-    'X64-30GB',
-    'X64-60GB',
-    'X64-120GB',
-]
 
 SCALEWAY_SERVER_STATES = (
     'stopped',
@@ -597,7 +550,7 @@ def main():
         image=dict(required=True),
         name=dict(),
         region=dict(required=True, choices=SCALEWAY_LOCATION.keys()),
-        commercial_type=dict(required=True, choices=SCALEWAY_COMMERCIAL_TYPES),
+        commercial_type=dict(required=True),
         enable_ipv6=dict(default=False, type="bool"),
         boot_type=dict(default="bootscript"),
         state=dict(choices=state_strategy.keys(), default='present'),
diff --git a/roles/cloud-lightsail/tasks/main.yml b/roles/cloud-lightsail/tasks/main.yml
index c152e5e..122745d 100644
--- a/roles/cloud-lightsail/tasks/main.yml
+++ b/roles/cloud-lightsail/tasks/main.yml
@@ -16,7 +16,7 @@
       zone: "{{ algo_region }}a"
       blueprint_id: "{{ cloud_providers.lightsail.image }}"
       bundle_id: "{{ cloud_providers.lightsail.size }}"
-      wait_timeout: 300
+      wait_timeout: "300"
       open_ports:
         - from_port: 4500
           to_port: 4500