Merge pull request quattor#102 from jouvin/el8_aii_support

EL8: improved support for configuring AII install URL
jouvin · Jul 14, 2023 · d60a622 · d60a622
2 parents 00ce307 + c6acf72
commit d60a622
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/config/core/base.pan b/config/core/base.pan
@@ -65,6 +65,23 @@ variable YUM_OS_DISTRIBUTION_NAME ?= {
   };
 };
 
+@{
+desc = namespace to use for OS YUM snapshots, defined early to be usable in AII configuration
+value = pan namespace
+default = repository/snapshot
+required = no
+}
+variable YUM_SNAPSHOT_NS ?= 'repository/snapshot';
+variable YUM_OS_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
+
+@{
+desc = name of the template used to configure the base OS repository
+value = template name
+default = OS_VERSION_PARAMS['major'] + '_baseos'
+required = non
+}
+variable BASE_OS_REPOSITORY_TEMPLATE ?= if ( !is_null(BASE_OS_REPOSITORY_TEMPLATE) ) format('%s_baseos', OS_VERSION_PARAMS['major']);
+
 @{
 desc = use iptables and ip6tables services instead of firewalld
 value = true or false

diff --git a/config/quattor/aii.pan b/config/quattor/aii.pan
@@ -17,6 +17,7 @@ variable AII_OSINSTALL_OS_VERSION ?= if ( is_defined(YUM_OS_DISTRIBUTION_NAME) )
                                      } else {
                                        error('YUM_OS_DISTRIBUTION_NAME undefined: cannot determine OS installer version to use');
                                      };
+variable TEST = debug(format('YUM_OS_DISTRIBUTION_NAME=%s, AII_OSINSTALL_OS_VERSION=%s', YUM_OS_DISTRIBUTION_NAME, AII_OSINSTALL_OS_VERSION));
 
 # Include base configuration for AII
 

diff --git a/repository/config/os.pan b/repository/config/os.pan
@@ -22,8 +22,7 @@ required = no
 }
 variable REPOSITORY_CENTOS_EXTRAS_ENABLED ?= false;
 
-variable YUM_SNAPSHOT_NS ?= 'repository/snapshot';
-variable YUM_OS_SNAPSHOT_NS ?= YUM_SNAPSHOT_NS;
+variable YUM_OS_SNAPSHOT_NS ?= error('YUM_OS_SNAPSHOT_NS should already have been defined');
 
 @{
 desc =  list of repository to load specified as a list of templates describing the repositories
@@ -33,7 +32,7 @@ required = no
 }
 include { 'repository/config/quattor' };
 variable OS_REPOSITORY_LIST ?= {
-    append(OS_VERSION_PARAMS['major']+'_'+'baseos');
+    append(BASE_OS_REPOSITORY_TEMPLATE);
     append(OS_VERSION_PARAMS['major']+'_'+'appstream');
     append(OS_VERSION_PARAMS['major']+'_'+'powertools');
     if ( REPOSITORY_CENTOS_EXTRAS_ENABLED ) {