summaryrefslogtreecommitdiff
path: root/lib/ansible/modules/cloud/scaleway
diff options
context:
space:
mode:
authorRémy Léone <remy.leone@gmail.com>2018-04-25 19:35:54 +0200
committerBrian Coca <bcoca@users.noreply.github.com>2018-04-25 13:35:54 -0400
commite45a5e1c868eb544c69fdea383f7022c92b08390 (patch)
tree42b892397197f107fc90b9d6b3ca79b70c38a95f /lib/ansible/modules/cloud/scaleway
parent0f3480d35907f21737b3459abce90f60fa9542e6 (diff)
downloadansible-e45a5e1c868eb544c69fdea383f7022c92b08390.tar.gz
Add a Scaleway dynamic inventory plugin (#38739)
Diffstat (limited to 'lib/ansible/modules/cloud/scaleway')
-rw-r--r--lib/ansible/modules/cloud/scaleway/scaleway_compute.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py
index a909084920..09ac2fb263 100644
--- a/lib/ansible/modules/cloud/scaleway/scaleway_compute.py
+++ b/lib/ansible/modules/cloud/scaleway/scaleway_compute.py
@@ -160,7 +160,7 @@ import time
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.basic import env_fallback
from ansible.module_utils.six.moves.urllib.parse import quote as urlquote
-from ansible.module_utils.scaleway import ScalewayAPI
+from ansible.module_utils.scaleway import ScalewayAPI, SCALEWAY_LOCATION
SCALEWAY_COMMERCIAL_TYPES = [
@@ -189,13 +189,6 @@ SCALEWAY_COMMERCIAL_TYPES = [
'X64-120GB',
]
-SCALEWAY_LOCATION = {
- 'par1': {'name': 'Paris 1', 'country': 'FR', "api_endpoint": 'https://cp-par1.scaleway.com'},
- 'EMEA-FR-PAR1': {'name': 'Paris 1', 'country': 'FR', "api_endpoint": 'https://cp-par1.scaleway.com'},
- 'ams1': {'name': 'Amsterdam 1', 'country': 'NL', "api_endpoint": 'https://cp-ams1.scaleway.com'},
- 'EMEA-NL-EVS': {'name': 'Amsterdam 1', 'country': 'NL', "api_endpoint": 'https://cp-ams1.scaleway.com'},
-}
-
SCALEWAY_SERVER_STATES = (
'stopped',
'stopping',