ansible/hetzner.hcloud
1
0
Fork 0
mirror of https://github.com/ansible-collections/hetzner.hcloud.git synced 2026-02-04 08:01:49 +00:00
Code Activity

Bugfix: allow hcloud.yml and hcloud.yaml again as inventory configuration.

Browse source
This commit is contained in:
Lukas Kämmerling 2020-06-30 09:43:19 +02:00
parent 3df221eb82
commit 9dc3c3ade2
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/modules/hcloud_load_balancer.py
View file

@ -236,7 +236,7 @@ class AnsibleHcloudLoadBalancer(Hcloud):
self._get_load_balancer()
disable_public_interface = self.module.params.get("disable_public_interface")
if disable_public_interface is not None and disable_public_interface != self.hcloud_load_balancer.public_net.enabled:
if disable_public_interface is not None and disable_public_interface != (not self.hcloud_load_balancer.public_net.enabled):
if not self.module.check_mode:
if disable_public_interface is True:
self.hcloud_load_balancer.disable_public_interface().wait_until_finished()
@ -250,10 +250,8 @@ class AnsibleHcloudLoadBalancer(Hcloud):
def present_load_balancer(self):
self._get_load_balancer()
if self.hcloud_load_balancer is None:
self.module.debug(msg="Create")
self._create_load_balancer()
else:
self.module.debug(msg="Update")
self._update_load_balancer()
def delete_load_balancer(self):
@ -278,7 +276,7 @@ class AnsibleHcloudLoadBalancer(Hcloud):
network_zone={"type": "str"},
labels={"type": "dict"},
delete_protection={"type": "bool"},
disable_public_interface={"type": "bool", "default": False},
disable_public_interface={"type": "bool"},
state={
"choices": ["absent", "present"],
"default": "present",

2
plugins/modules/hcloud_load_balancer_service.py
View file

@ -322,7 +322,7 @@ class AnsibleHcloudLoadBalancerService(Hcloud):
"response": to_native(self.hcloud_load_balancer_service.health_check.http.response),
"certificates": [to_native(status_code) for status_code in
self.hcloud_load_balancer_service.health_check.http.status_codes],
"tls": self.hcloud_load_balancer_service.health_check.tls,
"tls": self.hcloud_load_balancer_service.health_check.http.tls,
}
return {
"load_balancer": to_native(self.hcloud_load_balancer.name),

4
tests/integration/targets/hcloud_load_balancer/tasks/main.yml
View file

@ -29,7 +29,7 @@
state: present
register: result
check_mode: yes
- name: test create Load Balancer Load Balancer
- name: test create Load Balancer with check mode
assert:
that:
- result is changed
@ -51,6 +51,8 @@
- name: test create Load Balancer idempotence
hcloud_load_balancer:
name: "{{ hcloud_load_balancer_name }}"
load_balancer_type: lb11
network_zone: eu-central
state: present
register: result
- name: verify create Load Balancer idempotence

1
tests/utils/gitlab/gitlab.sh
View file

@ -46,6 +46,7 @@ fi
export ANSIBLE_COLLECTIONS_PATHS="${HOME}/.ansible"
SHIPPABLE_RESULT_DIR="$(pwd)/shippable"
TEST_DIR="${ANSIBLE_COLLECTIONS_PATHS}/ansible_collections/hetzner/hcloud"
rm -rf "${TEST_DIR}"
mkdir -p "${TEST_DIR}"
cp -r "." "${TEST_DIR}"
cd "${TEST_DIR}"

2
tests/utils/gitlab/integration.sh
View file

@ -12,4 +12,4 @@ hcloud_api_token=${HCLOUD_TOKEN}
export SHIPPABLE="true"
export SHIPPABLE_BUILD_NUMBER="gl-$(cat prefix.txt)"
export SHIPPABLE_JOB_NUMBER="$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 2 | head -n 1)"
ansible-test integration --color --local -vvvvv "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"}
ansible-test integration --color --local -vv "${target}" ${COVERAGE:+"$COVERAGE"} ${CHANGED:+"$CHANGED"} ${UNSTABLE:+"$UNSTABLE"}