some more refactoring and cleanup of cloud install roles

2 files changed, 16 insertions, 16 deletions

diff --git a/roles/cloud/install/tasks/hcloud.yml b/roles/cloud/install/tasks/hcloud.yml
index ca5435b8..646d80da 100644
--- a/roles/cloud/install/tasks/hcloud.yml
+++ b/roles/cloud/install/tasks/hcloud.yml
@@ -4,17 +4,17 @@
     url: "https://api.hetzner.cloud/v1/ssh_keys"
     method: GET
     headers:
-      Authorization: "Bearer {{ install_cooked.cloud_credentials.token }}"
+      Authorization: "Bearer {{ install_cooked.cloud.credentials.token }}"
     status_code: 200
   register: sshkeys
   delegate_to: localhost
 
 - name: retrieve server id and check if rescue mode is already active
   uri:
-    url: "https://api.hetzner.cloud/v1/servers?name={{ inventory_hostname }}"
+    url: "https://api.hetzner.cloud/v1/servers?name={{ install_cooked.cloud.server_name | default(inventory_hostname) }}"
     method: GET
     headers:
-      Authorization: "Bearer {{ install_cooked.cloud_credentials.token }}"
+      Authorization: "Bearer {{ install_cooked.cloud.credentials.token }}"
     status_code: 200
   register: serverstatus
   delegate_to: localhost
@@ -33,7 +33,7 @@
     method: POST
     body: "{{ {'type': 'linux64', 'ssh_keys': (sshkeys.json.ssh_keys | map(attribute='id') | list) } | to_nice_json }}"
     headers:
-      Authorization: "Bearer {{ install_cooked.cloud_credentials.token }}"
+      Authorization: "Bearer {{ install_cooked.cloud.credentials.token }}"
       Content-Type: "application/json"
     status_code: 201
   delegate_to: localhost
@@ -43,7 +43,7 @@
     url: "https://api.hetzner.cloud/v1/servers/{{ serverstatus.json.servers[0].id }}/actions/reset"
     method: POST
     headers:
-      Authorization: "Bearer {{ install_cooked.cloud_credentials.token }}"
+      Authorization: "Bearer {{ install_cooked.cloud.credentials.token }}"
     status_code: 201
   delegate_to: localhost
 
diff --git a/roles/cloud/install/tasks/hroot.yml b/roles/cloud/install/tasks/hroot.yml
index 606df5f6..86f52714 100644
--- a/roles/cloud/install/tasks/hroot.yml
+++ b/roles/cloud/install/tasks/hroot.yml
@@ -3,8 +3,8 @@
   uri:
     url: "https://robot-ws.your-server.de/key"
     method: GET
-    user: "{{ install_cooked.cloud_credentials.username }}"
-    password: "{{ install_cooked.cloud_credentials.password }}"
+    user: "{{ install_cooked.cloud.credentials.username }}"
+    password: "{{ install_cooked.cloud.credentials.password }}"
     force_basic_auth: yes
     status_code: 200
   register: sshkeys
@@ -22,8 +22,8 @@
     uri:
       url: "https://robot-ws.your-server.de/server"
       method: GET
-      user: "{{ install_cooked.cloud_credentials.username }}"
-      password: "{{ install_cooked.cloud_credentials.password }}"
+      user: "{{ install_cooked.cloud.credentials.username }}"
+      password: "{{ install_cooked.cloud.credentials.password }}"
       force_basic_auth: yes
       status_code: 200
     register: servers
@@ -32,7 +32,7 @@
 
   - name: extract server IP address from robot result
     set_fact:
-      hetzner_main_ip: "{{ servers.json | hroot_extract_serverip(host_name) }}"
+      hetzner_main_ip: "{{ servers.json | hroot_extract_serverip(install_cooked.cloud.server_name | default(inventory_hostname)) }}"
 
   when: hetzner_main_ip is not defined
 
@@ -48,8 +48,8 @@
   uri:
     url: "https://robot-ws.your-server.de/boot/{{ hetzner_main_ip }}/rescue"
     method: GET
-    user: "{{ install_cooked.cloud_credentials.username }}"
-    password: "{{ install_cooked.cloud_credentials.password }}"
+    user: "{{ install_cooked.cloud.credentials.username }}"
+    password: "{{ install_cooked.cloud.credentials.password }}"
     force_basic_auth: yes
     status_code: 200
   register: rescuestatus
@@ -62,8 +62,8 @@
   uri:
     url: "https://robot-ws.your-server.de/boot/{{ hetzner_main_ip }}/rescue"
     method: POST
-    user: "{{ install_cooked.cloud_credentials.username }}"
-    password: "{{ install_cooked.cloud_credentials.password }}"
+    user: "{{ install_cooked.cloud.credentials.username }}"
+    password: "{{ install_cooked.cloud.credentials.password }}"
     force_basic_auth: yes
     body: "os=linux&arch=64&authorized_key[]={{ sshkeys.json | hroot_extract_ssh_key_fingerprints | join('&authorized_key[]=') }}"
     status_code: 200
@@ -79,8 +79,8 @@
   uri:
     url: "https://robot-ws.your-server.de/reset/{{ hetzner_main_ip }}"
     method: POST
-    user: "{{ install_cooked.cloud_credentials.username }}"
-    password: "{{ install_cooked.cloud_credentials.password }}"
+    user: "{{ install_cooked.cloud.credentials.username }}"
+    password: "{{ install_cooked.cloud.credentials.password }}"
     force_basic_auth: yes
     body: "type=hw"
     status_code: 200