Scaleway and Lightsail fixes

This commit is contained in:
Jack Ivanov 2019-08-15 12:29:22 +02:00
parent 25a5846c00
commit d2e65babc7
3 changed files with 3 additions and 49 deletions

View file

@ -6,6 +6,7 @@ host_key_checking = False
timeout = 60 timeout = 60
stdout_callback = default stdout_callback = default
display_skipped_hosts = no display_skipped_hosts = no
force_valid_group_names = ignore
[paramiko_connection] [paramiko_connection]
record_host_keys = False record_host_keys = False

View file

@ -88,26 +88,6 @@ options:
description: description:
- Commercial name of the compute node - Commercial name of the compute node
required: true 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: wait:
description: 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.six.moves.urllib.parse import quote as urlquote
from ansible.module_utils.scaleway import SCALEWAY_LOCATION, scaleway_argument_spec, Scaleway 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 = ( SCALEWAY_SERVER_STATES = (
'stopped', 'stopped',
@ -597,7 +550,7 @@ def main():
image=dict(required=True), image=dict(required=True),
name=dict(), name=dict(),
region=dict(required=True, choices=SCALEWAY_LOCATION.keys()), 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"), enable_ipv6=dict(default=False, type="bool"),
boot_type=dict(default="bootscript"), boot_type=dict(default="bootscript"),
state=dict(choices=state_strategy.keys(), default='present'), state=dict(choices=state_strategy.keys(), default='present'),

View file

@ -16,7 +16,7 @@
zone: "{{ algo_region }}a" zone: "{{ algo_region }}a"
blueprint_id: "{{ cloud_providers.lightsail.image }}" blueprint_id: "{{ cloud_providers.lightsail.image }}"
bundle_id: "{{ cloud_providers.lightsail.size }}" bundle_id: "{{ cloud_providers.lightsail.size }}"
wait_timeout: 300 wait_timeout: "300"
open_ports: open_ports:
- from_port: 4500 - from_port: 4500
to_port: 4500 to_port: 4500