summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-04-23 04:59:13 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-04-23 04:59:13 +0200
commit9d9d4fdc70ec0ac276f3795f5ccea39d6b94b995 (patch)
tree72ebbbbb00cfea15039663a765c8372a8b3c04e9 /roles
parentrefactor all install roles ans playbooks to work with new variable install_ho... (diff)
further cleanup host bootstraping
Diffstat (limited to 'roles')
-rw-r--r--roles/cloud/install/tasks/hcloud.yml2
-rw-r--r--roles/cloud/install/tasks/hroot.yml2
-rw-r--r--roles/cloud/install/templates/hetzner_installimage.conf.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/cloud/install/tasks/hcloud.yml b/roles/cloud/install/tasks/hcloud.yml
index 983b3dec..b716f4ac 100644
--- a/roles/cloud/install/tasks/hcloud.yml
+++ b/roles/cloud/install/tasks/hcloud.yml
@@ -76,7 +76,7 @@
delay: 30
timeout: 120
-- import_tasks: hetzner_installimage.yml
+- include_tasks: hetzner_installimage.yml
- name: reboot
shell: sleep 2 && shutdown -r now "triggered by ansible after running installimage"
diff --git a/roles/cloud/install/tasks/hroot.yml b/roles/cloud/install/tasks/hroot.yml
index b7d511a0..1ff4a55d 100644
--- a/roles/cloud/install/tasks/hroot.yml
+++ b/roles/cloud/install/tasks/hroot.yml
@@ -97,7 +97,7 @@
delay: 30
timeout: 120
-- import_tasks: hetzner_installimage.yml
+- include_tasks: hetzner_installimage.yml
- name: reboot
shell: sleep 2 && shutdown -r now "triggered by ansible after running installimage"
diff --git a/roles/cloud/install/templates/hetzner_installimage.conf.j2 b/roles/cloud/install/templates/hetzner_installimage.conf.j2
index a30fb94a..0881b110 100644
--- a/roles/cloud/install/templates/hetzner_installimage.conf.j2
+++ b/roles/cloud/install/templates/hetzner_installimage.conf.j2
@@ -1,4 +1,4 @@
-HOSTNAME {{ host_name }}
+HOSTNAME {{ host_name }}{% if host_domain %}.{{ host_domain }}{% endif %}{{ '' }}
{% if cloud_provider == "hroot" %}
{% if install_cooked.disks.layout == "nvme_raid" %}
DRIVE1 /dev/nvme0n1