diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-09-09 19:50:45 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-09-09 19:50:45 +0200 |
| commit | ede69ab308a7dbb760947057704924050a0f0196 (patch) | |
| tree | 1e3e1a69722f7ebdaae86d2574e7018e92e2d9f7 | |
| parent | another minor cleanup (diff) | |
minor refactoring
| -rw-r--r-- | roles/cloud/install/templates/hetzner_postinst.sh.j2 | 4 | ||||
| -rw-r--r-- | roles/cloud/post-install/tasks/hetzner_postinst.yml | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/cloud/install/templates/hetzner_postinst.sh.j2 b/roles/cloud/install/templates/hetzner_postinst.sh.j2 index 7991ea19..ac357db6 100644 --- a/roles/cloud/install/templates/hetzner_postinst.sh.j2 +++ b/roles/cloud/install/templates/hetzner_postinst.sh.j2 @@ -28,7 +28,7 @@ rm -f /swapfile {% if install_cooked.disks.root_lvm_size != "all" %} sed -e '/\/dummy/d' -i /etc/fstab -cat > /post-post-install.sh <<EOF +cat > /post-install-finalize <<EOF #!/bin/bash raid_devices=\$(mdadm -Q -Y --detail /dev/md2 2> /dev/null | awk -F = '/MD_DEVICE_.*_DEV=/ { print(\$2) }') @@ -44,7 +44,7 @@ fi rm -rf /dummy EOF -chmod +x /post-post-install.sh +chmod +x /post-install-finalize {% endif %} {% if install_distro == "debian" %} diff --git a/roles/cloud/post-install/tasks/hetzner_postinst.yml b/roles/cloud/post-install/tasks/hetzner_postinst.yml index d8173dec..aaa7d28c 100644 --- a/roles/cloud/post-install/tasks/hetzner_postinst.yml +++ b/roles/cloud/post-install/tasks/hetzner_postinst.yml @@ -1,19 +1,19 @@ --- - name: check if post-post-install script is present stat: - path: /post-post-install.sh - register: hetzner_post_post_install + path: /post-install-finalize + register: hetzner_post_install_finalize -- name: run post-post-install script - when: hetzner_post_post_install.stat.exists - command: /post-post-install.sh +- name: run post-install-finalize script + when: hetzner_post_install_finalize.stat.exists + command: /post-install-finalize - name: remove installimage artifacts loop: - /installimage.conf - /installimage.debug - /post-install - - /post-post-install.sh + - /post-install-finalize - /target file: path: "{{ item }}" |