Markus Katharina Brechtel 4 лет назад
Родитель
Сommit
8bcd5a1678
5 измененных файлов: 5 добавлений и 11 удалений
  1. +1
    -1
      defaults/main.yml
  2. +2
    -2
      tasks/host_vars.yml
  3. +0
    -5
      tasks/raid_profile.yml
  4. +1
    -1
      templates/host_vars.yaml.j2
  5. +1
    -2
      vars/profile.yml

+ 1
- 1
defaults/main.yml Просмотреть файл

@@ -1,5 +1,5 @@
partitioning_base_profile: bios-gpt
partitioning_raid_profile: auto
partitioning_raid_profile: "{{ ( hard_disks | length > 1 ) | ternary('mirror','single') }}"
partitioning_crypt_profile: none

hard_disks_scan: false


+ 2
- 2
tasks/host_vars.yml Просмотреть файл

@@ -9,8 +9,8 @@
- name: host_vars file
local_action: template
args:
src: host_vars.yml.j2
dest: "{{ playbook_dir }}/host_vars/{{inventory_hostname}}/{{_host_vars_filename}}.yml"
src: host_vars.yaml.j2
dest: "{{ playbook_dir }}/host_vars/{{inventory_hostname}}/{{_host_vars_filename}}.yaml"

- name: include host_vars
include_vars:


+ 0
- 5
tasks/raid_profile.yml Просмотреть файл

@@ -1,10 +1,5 @@
---

- name: set raid profile to mdraid if more than one disk and to single if one
set_fact:
partitioning_raid_profile: "{{ ( hard_disks | length > 1 ) | ternary('mirror','single') }}"
when: partitioning_raid_profile == 'auto'

- name: load raid profile vars
include_vars:
file: "raid_profiles/{{partitioning_raid_profile}}.yml"


templates/host_vars.yml.j2 → templates/host_vars.yaml.j2 Просмотреть файл

@@ -1 +1 @@
{% if ("host_vars/"+inventory_hostname+'/'+_host_vars_filename+'.yml') | is_file %}{{ _host_vars_default | combine( lookup('file','host_vars/'+inventory_hostname+'/'+_host_vars_filename+'.yml') | from_yaml ) | combine( _host_vars | to_json | from_json ) | to_nice_yaml }}{% else %}{{ _host_vars_default | combine( _host_vars | to_json | from_json ) | to_nice_yaml }}{% endif %}
{% if ("host_vars/"+inventory_hostname+'/'+_host_vars_filename+'.yaml') is file %}{{ _host_vars_default | combine( lookup('file','host_vars/'+inventory_hostname+'/'+_host_vars_filename+'.yaml') | from_yaml ) | combine( _host_vars | to_json | from_json ) | to_nice_yaml }}{% else %}{{ _host_vars_default | combine( _host_vars | to_json | from_json ) | to_nice_yaml }}{% endif %}

+ 1
- 2
vars/profile.yml Просмотреть файл

@@ -33,9 +33,8 @@ debian_boot_packages:
- busybox-static
- lvm2
- e2fsprogs
- btrfs-tools
- btrfs-progs
- openssh-server
- python
- console-setup
- acpi-support
- bridge-utils

Загрузка…
Отмена
Сохранить