mirror of
https://github.com/ansible-collections/hetzner.hcloud
synced 2024-11-10 06:34:13 +00:00
Fix compatibility of hcloud_server module with python version lower than python 3.6 (#80)
This commit is contained in:
parent
92b6ff064b
commit
04ef10041e
3 changed files with 13 additions and 13 deletions
2
changelogs/fragments/hcloud-server-py36.yaml
Normal file
2
changelogs/fragments/hcloud-server-py36.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- hcloud_server Fix incompatbility with python < 3.6
|
|
@ -8,8 +8,6 @@ from __future__ import absolute_import, division, print_function
|
|||
|
||||
__metaclass__ = type
|
||||
|
||||
from dateutil import relativedelta
|
||||
|
||||
DOCUMENTATION = '''
|
||||
---
|
||||
module: hcloud_server
|
||||
|
@ -262,6 +260,7 @@ hcloud_server:
|
|||
from ansible.module_utils.basic import AnsibleModule
|
||||
from ansible.module_utils._text import to_native
|
||||
from ansible_collections.hetzner.hcloud.plugins.module_utils.hcloud import Hcloud
|
||||
from datetime import timedelta
|
||||
|
||||
try:
|
||||
from hcloud.volumes.domain import Volume
|
||||
|
@ -401,20 +400,19 @@ class AnsibleHcloudServer(Hcloud):
|
|||
else:
|
||||
try:
|
||||
image = self.client.images.get_by_id(self.module.params.get("image"))
|
||||
except:
|
||||
self.module.fail_json(msg=f"Image {self.module.params.get('image')} was not found")
|
||||
except Exception:
|
||||
self.module.fail_json(msg="Image %s was not found" % self.module.params.get('image'))
|
||||
if image.deprecated is not None:
|
||||
available_until = image.deprecated + relativedelta.relativedelta(months=3)
|
||||
available_until = image.deprecated + timedelta(days=90)
|
||||
if self.module.params.get("allow_deprecated_image"):
|
||||
self.module.warn(
|
||||
f"You try to use a deprecated image. The image {image.name} will "
|
||||
f"continue to be available until {available_until.strftime('%Y-%m-%d')}."
|
||||
)
|
||||
"You try to use a deprecated image. The image %s will continue to be available until %s.") \
|
||||
% (image.name, available_until.strftime('%Y-%m-%d'))
|
||||
else:
|
||||
self.module.fail_json(msg=f"You try to use a deprecated image. The image {image.name} will "
|
||||
f"continue to be available until {available_until.strftime('%Y-%m-%d')}. "
|
||||
f"If you want to use this image use allow_deprecated_image=yes."
|
||||
)
|
||||
self.module.fail_json(
|
||||
msg=("You try to use a deprecated image. The image %s will continue to be available until %s." +
|
||||
" If you want to use this image use allow_deprecated_image=yes."
|
||||
) % (image.name, available_until.strftime('%Y-%m-%d')))
|
||||
return image
|
||||
|
||||
def _update_server(self):
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
assert:
|
||||
that:
|
||||
- result is failed
|
||||
- 'result.msg == "You try to use a deprecated image. The image ubuntu-16.04 will continue to be available until 2021-06-24. If you want to use this image use allow_deprecated_image=yes."'
|
||||
- 'result.msg == "You try to use a deprecated image. The image ubuntu-16.04 will continue to be available until 2021-06-22. If you want to use this image use allow_deprecated_image=yes."'
|
||||
|
||||
- name: test create server with check mode
|
||||
hcloud_server:
|
||||
|
|
Loading…
Reference in a new issue