From d48fb6ee4171c809c7553629c745816ace73e918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Mon, 1 Apr 2019 13:02:12 +0200 Subject: [PATCH] Remove check for commercial types in scaleway_compute (#54535) --- .../cloud/scaleway/scaleway_compute.py | 50 +------------------ 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py index 94dd8a93e5a..15870b8dd79 100644 --- a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py +++ b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py @@ -89,26 +89,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: @@ -182,34 +162,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', 'stopping', @@ -689,7 +641,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"), public_ip=dict(default="absent"), state=dict(choices=state_strategy.keys(), default='present'),