cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "Remove VC scaleway (#40791)" (#41401)

Browse source 
This reverts commit 007127ea27.
This commit is contained in:
Adam Miller 2018-06-11 11:19:29 -05:00 committed by GitHub
parent 007127ea27
commit 391509006c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/cloud/scaleway/scaleway_compute.py
View file

@ -95,10 +95,9 @@ options:
- C2S
- C2M
- C2L
- START1-XS
- START1-S
- START1-M
- START1-L
- VC1S
- VC1M
- VC1L
- X64-15GB
- X64-30GB
- X64-60GB
@ -181,10 +180,9 @@ SCALEWAY_COMMERCIAL_TYPES = [
'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
'VC1S', # Starter X86-64 (2 cores) - 2GB
'VC1M', # Starter X86-64 (4 cores) - 4GB
'VC1L', # Starter X86-64 (6 cores) - 8GB
'X64-15GB',
'X64-30GB',
'X64-60GB',

38
test/legacy/scaleway_compute.yml
View file

@ -16,7 +16,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
register: server_creation_check_task
@ -34,7 +34,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
register: server_creation_task
@ -53,7 +53,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
register: server_creation_confirmation_task
@ -73,7 +73,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
tags:
- test
- www
@ -93,7 +93,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -114,7 +114,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -136,7 +136,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
tags:
- test
- www
@ -156,7 +156,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -177,7 +177,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -199,7 +199,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
tags:
- test
- www
@ -219,7 +219,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -241,7 +241,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
tags:
- test
- www
@ -261,7 +261,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -282,7 +282,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -304,7 +304,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
tags:
- test
- www
@ -324,7 +324,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -345,7 +345,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
wait: true
tags:
- test
@ -367,7 +367,7 @@
image: 89ee4018-f8c3-4dc4-a6b5-bca14f985ebe
organization: this-organization-does-not-exists
region: ams1
commercial_type: START1-S
commercial_type: VC1S
register: unauthorized_organization_task
- debug: var=unauthorized_organization_task
@ -385,7 +385,7 @@
image: this-image-does-not-exists
organization: 951df375-e094-4d26-97c1-ba548eeb9c42
region: ams1
commercial_type: START1-S
commercial_type: VC1S
register: unexisting_image_check
- debug: var=unexisting_image_check