diff options
Diffstat (limited to 'roles')
-rw-r--r-- | roles/installer/debian/base/defaults/main.yml (renamed from roles/installer/debian/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/installer/debian/base/tasks/main.yml (renamed from roles/installer/debian/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/defaults/main.yml (renamed from roles/preseed/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/tasks/main.yml (renamed from roles/preseed/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 (renamed from roles/preseed/templates/preseed_debian-buster.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 (renamed from roles/preseed/templates/preseed_debian-jessie.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 (renamed from roles/preseed/templates/preseed_debian-stretch.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 (renamed from roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 (renamed from roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/debian/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 (renamed from roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2) | 0 | ||||
-rw-r--r-- | roles/installer/openbsd/base/defaults/main.yml (renamed from roles/installer/openbsd/defaults/main.yml) | 0 | ||||
-rw-r--r-- | roles/installer/openbsd/base/tasks/main.yml (renamed from roles/installer/openbsd/tasks/main.yml) | 0 | ||||
-rw-r--r-- | roles/usb-install/meta/main.yml | 2 | ||||
-rw-r--r-- | roles/usb-install/tasks/main.yml | 2 | ||||
-rw-r--r-- | roles/vm/install/meta/main.yml | 2 | ||||
-rw-r--r-- | roles/vm/install/tasks/main.yml | 2 |
16 files changed, 4 insertions, 4 deletions
diff --git a/roles/installer/debian/defaults/main.yml b/roles/installer/debian/base/defaults/main.yml index 8962e9ad..8962e9ad 100644 --- a/roles/installer/debian/defaults/main.yml +++ b/roles/installer/debian/base/defaults/main.yml diff --git a/roles/installer/debian/tasks/main.yml b/roles/installer/debian/base/tasks/main.yml index 92fac536..92fac536 100644 --- a/roles/installer/debian/tasks/main.yml +++ b/roles/installer/debian/base/tasks/main.yml diff --git a/roles/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index c5400493..c5400493 100644 --- a/roles/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml diff --git a/roles/preseed/tasks/main.yml b/roles/installer/debian/preseed/tasks/main.yml index b1b5d275..b1b5d275 100644 --- a/roles/preseed/tasks/main.yml +++ b/roles/installer/debian/preseed/tasks/main.yml diff --git a/roles/preseed/templates/preseed_debian-buster.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 index 9952fa0a..9952fa0a 100644 --- a/roles/preseed/templates/preseed_debian-buster.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-buster.cfg.j2 diff --git a/roles/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index 4519d910..4519d910 100644 --- a/roles/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 index 8969fa7c..8969fa7c 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-stretch.cfg.j2 diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index a2fffd11..a2fffd11 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-bionic.cfg.j2 diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 0b3d3698..0b3d3698 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_ubuntu-xenial.cfg.j2 diff --git a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 index 22f47ce7..22f47ce7 100644 --- a/roles/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_xubuntu-cosmic-desktop-with-raid.cfg.j2 diff --git a/roles/installer/openbsd/defaults/main.yml b/roles/installer/openbsd/base/defaults/main.yml index 6650e064..6650e064 100644 --- a/roles/installer/openbsd/defaults/main.yml +++ b/roles/installer/openbsd/base/defaults/main.yml diff --git a/roles/installer/openbsd/tasks/main.yml b/roles/installer/openbsd/base/tasks/main.yml index fcc79589..fcc79589 100644 --- a/roles/installer/openbsd/tasks/main.yml +++ b/roles/installer/openbsd/base/tasks/main.yml diff --git a/roles/usb-install/meta/main.yml b/roles/usb-install/meta/main.yml index 0fc96588..9db4a441 100644 --- a/roles/usb-install/meta/main.yml +++ b/roles/usb-install/meta/main.yml @@ -1,5 +1,5 @@ dependencies: - - role: installer/debian + - role: installer/debian/base distros: - distro: "{{ install_distro }}" codename: "{{ install_codename }}" diff --git a/roles/usb-install/tasks/main.yml b/roles/usb-install/tasks/main.yml index fab32b02..3153b633 100644 --- a/roles/usb-install/tasks/main.yml +++ b/roles/usb-install/tasks/main.yml @@ -6,7 +6,7 @@ register: tmpdir - import_role: - name: preseed + name: installer/debian/preseed vars: preseed_tmpdir: "{{ tmpdir.path }}" diff --git a/roles/vm/install/meta/main.yml b/roles/vm/install/meta/main.yml index 347e30c4..34c068b6 100644 --- a/roles/vm/install/meta/main.yml +++ b/roles/vm/install/meta/main.yml @@ -1,6 +1,6 @@ --- # dependencies: -# - role: installer/debian +# - role: installer/debian/base # distros: # - distro: "{{ install_distro }}" # codename: "{{ install_codename }}" diff --git a/roles/vm/install/tasks/main.yml b/roles/vm/install/tasks/main.yml index 10b10e18..9d5ea6a2 100644 --- a/roles/vm/install/tasks/main.yml +++ b/roles/vm/install/tasks/main.yml @@ -29,7 +29,7 @@ register: tmpdir # - import_role: - # name: preseed + # name: installer/debian/preseed # vars: # ssh_keys_root: "{{ hostvars[hostname].ssh_keys_root }}" # preseed_tmpdir: "{{ tmpdir.path }}" |