Merge pull request #166 from jouvin/machine-types-core-refactoring

machine-types/core: refactoring to avoid loading Quattor schema too early

Author: jrha

machine-types/core-init.pan

@@ -14,11 +14,15 @@ include SITE_GLOBAL_VARS_TEMPLATE;
 variable SITE_FUNCTIONS_TEMPLATE ?= if_exists('site/functions');
 include SITE_FUNCTIONS_TEMPLATE;
 
+# Load Quattor version
+include 'quattor/client/version';
+variable DEBUG = debug('QUATTOR_RELEASE = %s', to_string(QUATTOR_RELEASE));
+
 # Package management core functions
 include 'components/spma/functions';
 
-# profile_base for profile structure
-include 'quattor/profile_base';
+# Load Pan units
+include 'pan/units';
 
 # hardware
 include 'hardware/functions';

machine-types/core.pan

@@ -27,10 +27,7 @@ variable OS_POSTPONE_AII_CONFIG ?= OS_POSTPONE_FILESYSTEM_CONFIG;
 variable DEBUG = debug('%s: OS_POSTPONE_AII_CONFIG=%s', OS_POSTPONE_AII_CONFIG);
 
 
-# Grub configuration module initialisation
-include 'components/grub/config';
-
-# common site machine configuration
+# common site machine early configuration
 variable SITE_CONFIG_TEMPLATE ?= 'site/config';
 include SITE_CONFIG_TEMPLATE;
 
@@ -54,9 +51,6 @@ variable OS_NS_REPOSITORY ?= 'repository/';
 # software packages
 include 'pan/functions';
 
-# Configure Bind resolver
-include 'site/named';
-
 
 # Include OS version dependent RPMs
 variable SERVICE_OS_BASE_TEMPLATE = {
@@ -68,6 +62,19 @@ variable SERVICE_OS_BASE_TEMPLATE = {
 };
 include SERVICE_OS_BASE_TEMPLATE;
 
+# common site machine configuration to be done after the OS
+variable SITE_CONFIG_POSTOS_TEMPLATE ?= 'site/config-postos';
+include if_exists(SITE_CONFIG_POSTOS_TEMPLATE);
+
+# profile_base for profile structure
+include 'quattor/profile_base';
+
+# Configure Bind resolver
+include 'site/named';
+
+# Grub configuration module initialisation
+include 'components/grub/config';
+
 # Configure time synchonisation
 include if_exists('site/time_synchronisation');