From 6b9efab07f7f1b100a4597774600f47793655872 Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Thu, 25 May 2017 00:03:08 +0000 Subject: [PATCH] current --- meta/main.yml | 16 +++++++--------- meta/main.yml~ | 35 ----------------------------------- 2 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 meta/main.yml~ diff --git a/meta/main.yml b/meta/main.yml index 49a9d8d..e7b0f0b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,13 +1,18 @@ dependencies: - role: partitioning + when: hard_disks is defined - role: mdraid_devices mdraid_devices_state: created + when: mdraid_devices is defined - role: dmcrypt_devices dmcrypt_devices_state: formated + when: dmcrypt_devices is defined - role: volume_groups volume_groups_state: present + when: volume_groups is defined - role: logical_volumes logical_volumes_state: present + when: logical_volumes is defined - role: filesystems filesystems_state: formated - role: debootstrap @@ -23,22 +28,15 @@ dependencies: - bridge-utils - console-setup - acpi-support - - role: mdraid_mdadm_conf + #- role: mdraid_mdadm_conf - role: dmcrypt_crypttab + when: dmcrypt_devices is defined - role: fstab - role: keyboard_configuration - - role: chroot_environment - chroot_environment_state: mounted - role: grub_bootloader - - role: update_initramfs - - role: chroot_environment - chroot_environment_state: unmounted - role: network_interfaces - role: ssh_root_access - role: ssh_host_key ssh_host_key_state: fetched - role: filesystems filesystems_state: unmounted - - role: reboot - - role: ssh_host_key - ssh_host_key_state: configured diff --git a/meta/main.yml~ b/meta/main.yml~ deleted file mode 100644 index 38036c1..0000000 --- a/meta/main.yml~ +++ /dev/null @@ -1,35 +0,0 @@ -dependencies: - - role: manitu_rescue_prepare - - role: hostname - - role: default_partitions - default_partitions_profile: mdraid1_lvm - - role: partitioning - - role: mdraid_devices - - role: dmcrypt_devices - - role: volume_groups - - role: logical_volumes - - role: filesystems - mount_directory_target: /target - - role: debootstrap - debootstrap_target: /target - debootstrap_include: - - linux-image-amd64 - - mdadm - - lvm2 - - cryptsetup - - openssh-server - - btrfs-tools - - grub-pc - - python - debootstrap_mirror: http://mirror.manitu.net/debian - - role: chroot_environment - chroot_environment_target: /target - - role: fstab - fstab_file: /target/etc/fstab - - role: grub_bootloader - chroot_target: /target - - role: network_interfaces - network_interfaces_target: /target - - role: ssh_access - ssh_access_target: /target - - role: reboot