Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ac64236154 | |||
| 924d4fea6a | |||
| 885f686ce7 | |||
| 3284e0ead7 |
@@ -2,10 +2,6 @@ variant: fcos
|
|||||||
version: 1.5.0
|
version: 1.5.0
|
||||||
passwd:
|
passwd:
|
||||||
users:
|
users:
|
||||||
- name: root
|
|
||||||
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
|
||||||
ssh_authorized_keys:
|
|
||||||
- "{{ lookup('file', vm_ssh_public_key) | trim }}"
|
|
||||||
- name: {{ vm_user }}
|
- name: {{ vm_user }}
|
||||||
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
||||||
ssh_authorized_keys:
|
ssh_authorized_keys:
|
||||||
|
|||||||
@@ -2,10 +2,6 @@ variant: fcos
|
|||||||
version: 1.4.0
|
version: 1.4.0
|
||||||
passwd:
|
passwd:
|
||||||
users:
|
users:
|
||||||
- name: root
|
|
||||||
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
|
||||||
ssh_authorized_keys:
|
|
||||||
- "{{ lookup('file', vm_ssh_public_key) | trim }}"
|
|
||||||
- name: {{ vm_user }}
|
- name: {{ vm_user }}
|
||||||
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
password_hash: "{{ vm_password | password_hash('sha512') }}"
|
||||||
ssh_authorized_keys:
|
ssh_authorized_keys:
|
||||||
|
|||||||
@@ -7,6 +7,17 @@ passwd:
|
|||||||
ssh_authorized_keys:
|
ssh_authorized_keys:
|
||||||
- "{{ lookup('file', vm_ssh_public_key) | trim }}"
|
- "{{ lookup('file', vm_ssh_public_key) | trim }}"
|
||||||
storage:
|
storage:
|
||||||
|
disks:
|
||||||
|
- device: /dev/vdb
|
||||||
|
wipe_table: true
|
||||||
|
partitions:
|
||||||
|
- label: ext-data
|
||||||
|
number: 1
|
||||||
|
filesystems:
|
||||||
|
- device: /dev/vdb1
|
||||||
|
format: btrfs
|
||||||
|
label: ext-pool
|
||||||
|
wipe_filesystem: true
|
||||||
files:
|
files:
|
||||||
- path: /etc/ssh/sshd_config.d/permit_root_login.conf
|
- path: /etc/ssh/sshd_config.d/permit_root_login.conf
|
||||||
mode: 0644
|
mode: 0644
|
||||||
@@ -25,12 +36,12 @@ systemd:
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStartPre=/usr/bin/mkdir -p /run/mnt-root-init
|
ExecStartPre=/usr/bin/mkdir -p /run/mnt-ext-init
|
||||||
ExecStartPre=/usr/bin/mount -o subvolid=5 /dev/disk/by-label/ROOT /run/mnt-root-init
|
ExecStartPre=/usr/bin/mount LABEL=ext-pool /run/mnt-ext-init
|
||||||
# Hier werden die Subvolumes @home angelegt, falls sie nicht existieren
|
# Hier werden die Subvolumes @home angelegt, falls sie nicht existieren
|
||||||
ExecStart=/usr/bin/bash -c "for sub in @home; do [ -d /run/mnt-root-init/\$$sub ] || /usr/sbin/btrfs subvolume create /run/mnt-root-init/$$sub; done"
|
ExecStart=/usr/bin/bash -c "for sub in @home; do [ -d /run/mnt-ext-init/\$$sub ] || /usr/sbin/btrfs subvolume create /run/mnt-ext-init/$$sub; done"
|
||||||
ExecStartPost=/usr/bin/umount /run/mnt-root-init
|
ExecStartPost=/usr/bin/umount /run/mnt-ext-init
|
||||||
ExecStartPost=/usr/bin/rmdir /run/mnt-root-init
|
ExecStartPost=/usr/bin/rmdir /run/mnt-ext-init
|
||||||
RemainAfterExit=true
|
RemainAfterExit=true
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
@@ -44,7 +55,7 @@ systemd:
|
|||||||
Before=local-fs.target
|
Before=local-fs.target
|
||||||
|
|
||||||
[Mount]
|
[Mount]
|
||||||
What=/dev/disk/by-label/ROOT
|
What=LABEL=ext-pool
|
||||||
Where=/home
|
Where=/home
|
||||||
Type=btrfs
|
Type=btrfs
|
||||||
Options=defaults,subvol=@home
|
Options=defaults,subvol=@home
|
||||||
|
|||||||
@@ -76,6 +76,7 @@
|
|||||||
--vcpus {{ cpu | default(default_cpu) }} \
|
--vcpus {{ cpu | default(default_cpu) }} \
|
||||||
--memory {{ ram | default(default_ram) }} \
|
--memory {{ ram | default(default_ram) }} \
|
||||||
--disk size={{ disk | default('10') }},backing_store={{ vm_images_dir }}/{{ vm_name }}.qcow2,backing_format=qcow2,bus=virtio \
|
--disk size={{ disk | default('10') }},backing_store={{ vm_images_dir }}/{{ vm_name }}.qcow2,backing_format=qcow2,bus=virtio \
|
||||||
|
--disk size={{ disk | default('10') }},path={{ vm_images_dir }}/{{ vm_name }}-home.qcow2,bus=virtio \
|
||||||
--os-variant {{ os_variant }} \
|
--os-variant {{ os_variant }} \
|
||||||
--network network=default \
|
--network network=default \
|
||||||
--graphics none \
|
--graphics none \
|
||||||
|
|||||||
Reference in New Issue
Block a user