aii-ks: generate ks post section as standalone script

aii-core/src/main/perl/Shellfe.pm

@@ -389,6 +389,9 @@ sub _initialize
             $kernel_root = '' if ( $kernel_root eq '/' );
             $self->{CONFIG}->set(GRUB2_EFI_KERNEL_ROOT, $kernel_root);
         }
+    } else {
+        $self->{CONFIG}->set(GRUB2_EFI_KERNEL_ROOT, undef)
+            if $self->option(GRUB2_EFI_KERNEL_ROOT) eq NBPDIR_VARIANT_DISABLED;
     }
     # GRUB2_EFI_INITRD_CMD is always derived from GRUB2_EFI_LINUX_CMD as
     # Grub2 has a set of linux/initrd command pairs that must match together.
@@ -526,7 +529,7 @@ sub run_plugin
 
     # This is here because CacheManager and Fetch objects may have
     # problems when they get out of scope.
-    my @modules = $only_modulename ? ($only_modulename) : sort keys %$tree;
+    my @modules = $only_modulename ? ($only_modulename) : map {$tree->{$_}->{plugin_modulename} || $_} sort keys %$tree;
 
     # Iterate over module names, handling each
     foreach my $modulename (@modules) {

aii-core/src/test/perl/NCM/Component/doesexist.pm

@@ -0,0 +1,11 @@
+package NCM::Component::doesexist;
+
+sub new {
+    my $class = shift;
+
+    return bless {}, $class;
+}
+
+sub Test {1};
+
+1;

aii-core/src/test/perl/shellfe.t

@@ -1,9 +1,10 @@
 use strict;
 use warnings;
 use Test::More;
-use Test::Quattor qw(metaconfig);
+use Test::Quattor qw(metaconfig modulename_exists modulename_not_exists);
 use AII::Shellfe;
 use Cwd;
+use CAF::FileReader;
 
 use Readonly;
 use File::Basename qw(basename);
@@ -54,6 +55,21 @@ $cli->_metaconfig("somenode", {configuration => $cfg});
 my $fh = get_file(getcwd . "/target/test/cache/metaconfig/metaconfig/etc/something");
 is("$fh", "a=1\n\n", "metaconfig option rendered file in cache dir");
 
+# test modulename
+$cfg = get_config_for_profile('modulename_not_exists');
+
+$cli->{status} = 0;
+$cli->run_plugin({configuration => $cfg}, "/system/aii/osinstall", 'Test');
+is($cli->{status}, 16, "Failure");
+my $text;
+{local $/; open(my $fh, '<', $AII_LOG_FILE); $text = <$fh>;}
+like($text, qr{ERROR.*?Couldn't load plugin module doesnotexist},
+     "Failure due to osinstall module missing");
+
+$cli->{status} = 0;
+$cfg = get_config_for_profile('modulename_exists');
+$cli->run_plugin({configuration => $cfg}, "/system/aii/osinstall", 'Test');
+is($cli->{status}, 0, "No failure");
 
 
 done_testing;

aii-core/src/test/resources/modulename_exists.pan

@@ -0,0 +1,3 @@
+object template modulename_exists;
+
+"/system/aii/osinstall/doesnotexist/plugin_modulename" = "doesexist";

aii-core/src/test/resources/modulename_not_exists.pan

@@ -0,0 +1,3 @@
+object template modulename_not_exists;
+
+"/system/aii/osinstall/doesnotexist" = dict();

aii-ks/src/main/pan/quattor/aii/ks/schema.pan

@@ -75,6 +75,7 @@ type structure_ks_mail = {
     for user customization are under /system/ks/hooks/.
 }
 type structure_ks_ks_info = {
+    "plugin_modulename" ? string
     "ackurl" ? type_absoluteURI with {deprecated(0, "ackurl is deprecated, use acklist instead"); true; }
     "acklist" ? type_absoluteURI[]
     "auth" : string[] = list ("enableshadow", "passalgo=sha512")
@@ -90,6 +91,10 @@ type structure_ks_ks_info = {
     @{deprecated boolean. when defined, precedes value of mail/success.}
     "email_success" ? boolean with {deprecated(0, "email_success is deprecated; use mail/success instead"); true; }
     "firewall" ? structure_ks_ksfirewall
+    @{Kickstart installtype (string in exact kickstart repo command syntax).
+      If this contains a '@pattern@' substring, the installtype
+        (including the url and optional proxy option) is generated based on
+        the (first) enabled SPMA repository with name matching this glob pattern (without the '@').}
     "installtype" : string
     "installnumber" ? string
     "lang" : string = "en_US.UTF-8"
@@ -108,6 +113,12 @@ type structure_ks_ks_info = {
     "pre_install_script" ? type_absoluteURI
     "post_install_script" ? type_absoluteURI
     "post_reboot_script" ? type_absoluteURI
+    @{List of repositories (string in exact kickstart repo command syntax).
+      If a string contains a '@pattern@' substring, the repository
+        (including the baseurl and optional proxy, includepkgs and exclude pkgs options)
+        is generated based on the enabled SPMA repositories
+        with name(s) matching this glob pattern (without the '@').
+      }
     "repo" ? string[]
     "timezone" : string
     @{NTP servers used by Anaconda}
@@ -118,8 +129,12 @@ type structure_ks_ks_info = {
     "ignoredisk" ? string[]
     @{Base packages needed for a Quattor client to run (CAF, CCM...)}
     "base_packages" : string[]
-    @{Repositories to disable while SPMA is not available}
+    @{Repositories to disable while SPMA is not available (evaluated as glob matching the repository name)}
     "disabled_repos" : string[] = list()
+    @{Repositories to enable while SPMA is not available (evaluated as glob matching the repository name)}
+    "enabled_repos" : string[] = list()
+    @{Repositories to ignore while SPMA is not available (evaluated as glob matching the repository name)}
+    "ignored_repos" : string[] = list()
     "packages_args" : string[] = list("--ignoremissing", "--resolvedeps")
     "end_script" ? string with {
         deprecated(0, "end_script is deprecated and will be removed in a future release");
@@ -135,6 +150,8 @@ type structure_ks_ks_info = {
     @{agree with EULA (EL7+)}
     'eula' ? boolean
     'packagesinpost' ? boolean
+    @{install the correct kernel rpms as defined in /software/packages (if any)}
+    'kernelinpost' : boolean = true
     @{configure bonding (when not defined, it will be tried best-effort depending on OS version and configuration)}
     'bonding' ? boolean
     'lvmforce' ? boolean