Skip to content

Commit

Permalink
[Bug] Scaleway The volume is created systematically on par1 (#3964)
Browse files Browse the repository at this point in the history
* [Bug] The volume is created systematically on par1

* add change log

* added backward compatibility with organization

* add documentation

* change typo doc

* Update changelogs/fragments/3964-scaleway_volume_add_region.yml

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/modules/cloud/scaleway/scaleway_volume.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/modules/cloud/scaleway/scaleway_volume.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/modules/cloud/scaleway/scaleway_volume.py

Co-authored-by: Felix Fontein <felix@fontein.de>

* Update plugins/modules/cloud/scaleway/scaleway_volume.py

Co-authored-by: Rémy Léone <remy.leone@gmail.com>

* optimization

Co-authored-by: Romain SCHARFF <rscharff@plussimple.com>
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Rémy Léone <remy.leone@gmail.com>
  • Loading branch information
4 people authored Jan 5, 2022
1 parent bb78d98 commit 125516b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 4 deletions.
2 changes: 2 additions & 0 deletions changelogs/fragments/3964-scaleway_volume_add_region.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- scaleway_volume - all volumes are systematically created on par1 (https://github.com/ansible-collections/community.general/pull/3964).
26 changes: 22 additions & 4 deletions plugins/modules/cloud/scaleway/scaleway_volume.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
description:
- Name used to identify the volume.
required: true
project:
type: str
description:
- Scaleway project ID to which volume belongs.
version_added: 4.3.0
organization:
type: str
description:
Expand All @@ -71,7 +76,7 @@
name: my-volume
state: present
region: par1
organization: "{{ scw_org }}"
project: "{{ scw_org }}"
"size": 10000000000
volume_type: l_ssd
register: server_creation_check_task
Expand All @@ -93,7 +98,7 @@
"export_uri": null,
"id": "c675f420-cfeb-48ff-ba2a-9d2a4dbe3fcd",
"name": "volume-0-3",
"organization": "000a115d-2852-4b0a-9ce8-47f1134ba95a",
"project": "000a115d-2852-4b0a-9ce8-47f1134ba95a",
"server": null,
"size": 10000000000,
"volume_type": "l_ssd"
Expand All @@ -106,31 +111,37 @@


def core(module):
region = module.params["region"]
state = module.params['state']
name = module.params['name']
organization = module.params['organization']
project = module.params['project']
size = module.params['size']
volume_type = module.params['volume_type']
module.params['api_url'] = SCALEWAY_LOCATION[region]["api_endpoint"]

account_api = Scaleway(module)
response = account_api.get('volumes')
status_code = response.status_code
volumes_json = response.json

if project is None:
project = organization

if not response.ok:
module.fail_json(msg='Error getting volume [{0}: {1}]'.format(
status_code, response.json['message']))

volumeByName = None
for volume in volumes_json['volumes']:
if volume['organization'] == organization and volume['name'] == name:
if volume['project'] == project and volume['name'] == name:
volumeByName = volume

if state in ('present',):
if volumeByName is not None:
module.exit_json(changed=False)

payload = {'name': name, 'organization': organization, 'size': size, 'volume_type': volume_type}
payload = {'name': name, 'project': project, 'size': size, 'volume_type': volume_type}

response = account_api.post('/volumes', payload)

Expand Down Expand Up @@ -161,13 +172,20 @@ def main():
state=dict(default='present', choices=['absent', 'present']),
name=dict(required=True),
size=dict(type='int'),
project=dict(),
organization=dict(),
volume_type=dict(),
region=dict(required=True, choices=list(SCALEWAY_LOCATION.keys())),
))
module = AnsibleModule(
argument_spec=argument_spec,
supports_check_mode=True,
mutually_exclusive=[
('organization', 'project'),
],
required_one_of=[
('organization', 'project'),
],
)

core(module)
Expand Down

0 comments on commit 125516b

Please sign in to comment.