diff options
| author | Adam Miller <admiller@redhat.com> | 2018-06-11 11:19:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 11:19:29 -0500 |
| commit | 391509006ce73c707753fac29b6b494b6f6cba72 (patch) | |
| tree | bd65f2bc1b419eccbad54100f8418e599de67693 | |
| parent | 007127ea27b7dcadba8f297ccb953d42e3d3d22d (diff) | |
| download | ansible-391509006ce73c707753fac29b6b494b6f6cba72.tar.gz | |
Revert "Remove VC scaleway (#40791)" (#41401)
This reverts commit 007127ea27b7dcadba8f297ccb953d42e3d3d22d.
| -rw-r--r-- | lib/ansible/modules/cloud/scaleway/scaleway_compute.py | 14 | ||||
| -rw-r--r-- | test/legacy/scaleway_compute.yml | 38 |
2 files changed, 25 insertions, 27 deletions
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py index 5f1066929b..4b1348abd6 100644 --- a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py +++ b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py @@ -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', diff --git a/test/legacy/scaleway_compute.yml b/test/legacy/scaleway_compute.yml index 67984910b8..b3697dd099 100644 --- a/test/legacy/scaleway_compute.yml +++ b/test/legacy/scaleway_compute.yml @@ -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 |