Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
systemsmanagement:Uyuni:Snapshots:2020.04
cobbler
fixes-various-issues-found-during-cobbler-impor...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fixes-various-issues-found-during-cobbler-import.diff of Package cobbler
diff --git a/cobbler/api.py b/cobbler/api.py index 8b4c6f453..784488b5f 100644 --- a/cobbler/api.py +++ b/cobbler/api.py @@ -858,7 +858,7 @@ def import_tree(self, mirror_url, mirror_name, network_root=None, autoinstall_fi self.log("Network root given to --available-as is missing a colon, please see the manpage example.") return False - import_module = self.get_module_by_name("manage_import_signatures").get_import_manager(self._collection_mgr, logger) + import_module = self.get_module_by_name("managers.import_signatures").get_import_manager(self._collection_mgr, logger) import_module.run(path, mirror_name, network_root, autoinstall_file, arch, breed, os_version) # ========================================================================== diff --git a/cobbler/modules/managers/import_signatures.py b/cobbler/modules/managers/import_signatures.py index cef9f61dc..44bf52798 100644 --- a/cobbler/modules/managers/import_signatures.py +++ b/cobbler/modules/managers/import_signatures.py @@ -331,34 +331,34 @@ def add_entry(self, dirname, kernel, initrd): continue else: self.logger.info("creating new distro: %s" % name) - distro = distro.Distro(self.collection_mgr) + new_distro = distro.Distro(self.collection_mgr) if name.find("-autoboot") != -1: # this is an artifact of some EL-3 imports continue - distro.set_name(name) - distro.set_kernel(kernel) - distro.set_initrd(initrd) - distro.set_arch(pxe_arch) - distro.set_breed(self.breed) - distro.set_os_version(self.os_version) - distro.set_kernel_options(self.signature.get("kernel_options", "")) - distro.set_kernel_options_post(self.signature.get("kernel_options_post", "")) - distro.set_template_files(self.signature.get("template_files", "")) - supported_distro_boot_loaders = utils.get_supported_distro_boot_loaders(distro, self.api) - distro.set_supported_boot_loaders(supported_distro_boot_loaders) - distro.set_boot_loader(supported_distro_boot_loaders[0]) + new_distro.set_name(name) + new_distro.set_kernel(kernel) + new_distro.set_initrd(initrd) + new_distro.set_arch(pxe_arch) + new_distro.set_breed(self.breed) + new_distro.set_os_version(self.os_version) + new_distro.set_kernel_options(self.signature.get("kernel_options", "")) + new_distro.set_kernel_options_post(self.signature.get("kernel_options_post", "")) + new_distro.set_template_files(self.signature.get("template_files", "")) + supported_distro_boot_loaders = utils.get_supported_distro_boot_loaders(new_distro, self.api) + new_distro.set_supported_boot_loaders(supported_distro_boot_loaders) + new_distro.set_boot_loader(supported_distro_boot_loaders[0]) boot_files = '' for boot_file in self.signature["boot_files"]: boot_files += '$local_img_path/%s=%s/%s ' % (boot_file, self.path, boot_file) - distro.set_boot_files(boot_files.strip()) + new_distro.set_boot_files(boot_files.strip()) - self.configure_tree_location(distro) + self.configure_tree_location(new_distro) - self.distros.add(distro, save=True) - distros_added.append(distro) + self.distros.add(new_distro, save=True) + distros_added.append(new_distro) # see if the profile name is already used, if so, skip it and # do not modify the existing profile @@ -367,25 +367,25 @@ def add_entry(self, dirname, kernel, initrd): if existing_profile is None: self.logger.info("creating new profile: %s" % name) - profile = profile.Profile(self.collection_mgr) + new_profile = profile.Profile(self.collection_mgr) else: self.logger.info("skipping existing profile, name already exists: %s" % name) continue - profile.set_name(name) - profile.set_distro(name) - profile.set_autoinstall(self.autoinstall_file) + new_profile.set_name(name) + new_profile.set_distro(name) + new_profile.set_autoinstall(self.autoinstall_file) # depending on the name of the profile we can # define a good virt-type for usage with koan if name.find("-xen") != -1: - profile.set_virt_type("xenpv") + new_profile.set_virt_type("xenpv") elif name.find("vmware") != -1: - profile.set_virt_type("vmware") + new_profile.set_virt_type("vmware") else: - profile.set_virt_type("kvm") + new_profile.set_virt_type("kvm") - self.profiles.add(profile, save=True) + self.profiles.add(new_profile, save=True) return distros_added
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor