From 4b5025e9e30db30d6e264fabeb860a7758d7d7ad Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 8 Mar 2021 22:04:52 -0700
Subject: [PATCH] autoinstall_templates are installed into
/var/lib/cobbler/templates
---
cobbler/actions/sync.py | 2 +-
config/cobbler/settings.yaml | 4 ++--
docs/cobbler-conf.rst | 4 ++--
tests/test_data/settings_old | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cobbler/actions/sync.py b/cobbler/actions/sync.py
index 2667edb56..302c81de7 100644
--- a/cobbler/actions/sync.py
+++ b/cobbler/actions/sync.py
@@ -179,7 +179,7 @@ def clean_trees(self):
if x not in self.settings.webdir_whitelist:
# delete directories that shouldn't exist
utils.rmtree(path, logger=self.logger)
- if x in ["autoinstall_templates", "autoinstall_templates_sys", "images", "systems", "distros", "profiles", "repo_profile", "repo_system", "rendered"]:
+ if x in ["templates", "images", "systems", "distros", "profiles", "repo_profile", "repo_system", "rendered"]:
# clean out directory contents
utils.rmtree_contents(path, logger=self.logger)
#
diff --git a/config/cobbler/settings.yaml b/config/cobbler/settings.yaml
index b2e05a7bf..ac8edccbf 100644
--- a/config/cobbler/settings.yaml
+++ b/config/cobbler/settings.yaml
@@ -77,7 +77,7 @@ cheetah_import_whitelist:
createrepo_flags: "-c cache -s sha"
# if no autoinstall template is specified to profile add, use this template
-default_autoinstall: /var/lib/cobbler/autoinstall_templates/default.ks
+default_autoinstall: /var/lib/cobbler/templates/default.ks
# configure all installed systems to use these nameservers by default
# unless defined differently in the profile. For DHCP configurations
@@ -92,7 +92,7 @@ default_ownership:
- "admin"
# Cobbler has various sample automatic installation templates stored
-# in /var/lib/cobbler/autoinstall_templates/. This controls
+# in /var/lib/cobbler/templates/. This controls
# what install (root) password is set up for those
# systems that reference this variable. The factory
# default is "cobbler" and Cobbler check will warn if
diff --git a/docs/cobbler-conf.rst b/docs/cobbler-conf.rst
index 52621e278..ef65acc0b 100644
--- a/docs/cobbler-conf.rst
+++ b/docs/cobbler-conf.rst
@@ -257,7 +257,7 @@ default_autoinstall
If no autoinstall template is specified to profile add, use this template.
-default: ``/var/lib/cobbler/autoinstall_templates/default.ks``
+default: ``/var/lib/cobbler/templates/default.ks``
default_name_*
==============
@@ -284,7 +284,7 @@ default:
default_password_crypted
========================
-Cobbler has various sample automatic installation templates stored in ``/var/lib/cobbler/autoinstall_templates/``. This
+Cobbler has various sample automatic installation templates stored in ``/var/lib/cobbler/templates/``. This
controls what install (root) password is set up for those systems that reference this variable. The factory default is
"cobbler" and Cobbler check will warn if this is not changed. The simplest way to change the password is to run
``openssl passwd -1`` and put the output between the ``""``.
diff --git a/tests/test_data/settings_old b/tests/test_data/settings_old
index acbe8cdc9..1b531d21d 100644
--- a/tests/test_data/settings_old
+++ b/tests/test_data/settings_old
@@ -92,7 +92,7 @@ cheetah_import_whitelist:
createrepo_flags: "-c cache -s sha"
# if no autoinstall template is specified to profile add, use this template
-default_autoinstall: /var/lib/cobbler/autoinstall_templates/default.ks
+default_autoinstall: /var/lib/cobbler/templates/default.ks
# configure all installed systems to use these nameservers by default
# unless defined differently in the profile. For DHCP configurations
@@ -107,7 +107,7 @@ default_ownership:
- "admin"
# cobbler has various sample automatic installation templates stored
-# in /var/lib/cobbler/autoinstall_templates/. This controls
+# in /var/lib/cobbler/templates/. This controls
# what install (root) password is set up for those
# systems that reference this variable. The factory
# default is "cobbler" and cobbler check will warn if