Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 13, 2024
+20 −9
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions machine-types/core-init.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
21 changes: 14 additions & 7 deletions machine-types/core.pan
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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 = {
Expand All @@ -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');

Expand Down