Modernize include syntax

ulrich1919 · Jan 21, 2016 · d60221f · d60221f
1 parent b4a8ae0
commit d60221f
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 30 deletions.
diff --git a/quattor/aii/config.pan b/quattor/aii/config.pan
@@ -21,13 +21,13 @@
 
 unique template quattor/aii/config;
 
-include { 'quattor/functions/network' };
-include { 'quattor/functions/filesystem' };
-include { 'quattor/aii/schema' };
+include 'quattor/functions/network';
+include 'quattor/functions/filesystem';
+include 'quattor/aii/schema';
 
 # First include AII site configuration, if any
 variable AII_CONFIG_SITE ?= null;
-include {if_exists(to_string(AII_CONFIG_SITE));};
+include if_exists(to_string(AII_CONFIG_SITE));
 
 # For convenience
 variable AII_DOMAIN ?= value('/system/network/domainname');
@@ -38,9 +38,9 @@ variable AII_OSINSTALL_GEN ?= "quattor/aii/ks/config";
 variable AII_NBP_GEN ?= "quattor/aii/pxelinux/config";
 
 # Including the KS generator or equivalent
-include { AII_OSINSTALL_GEN};
+include AII_OSINSTALL_GEN;
 # Including the PXE generator or equivalent
-include { AII_NBP_GEN };
+include AII_NBP_GEN;
 
 
 

diff --git a/quattor/aii/dhcp/config.pan b/quattor/aii/dhcp/config.pan
@@ -11,4 +11,4 @@
 #
 template quattor/aii/dhcp/config;
 
-include {'quattor/aii/dhcp/schema'};
+include 'quattor/aii/dhcp/schema';
diff --git a/quattor/aii/ks/config.pan b/quattor/aii/ks/config.pan
@@ -15,7 +15,7 @@
 
 template quattor/aii/ks/config;
 
-include {'quattor/aii/ks/schema'};
+include 'quattor/aii/ks/schema';
 
 variable AII_DOMAIN ?= value('/system/network/domainname');
 variable AII_HOSTNAME ?= value('/system/network/hostname');
@@ -389,14 +389,14 @@ variable  AII_KS_OS_MAJOR_SPECIFIC_INCLUDE ?= if ( is_defined(OS_VERSION_PARAMS[
                                                    } else {
                                                      undef;
                                                    };
-include { debug('KS specific configuration for OS major version: '+to_string(AII_KS_OS_MAJOR_SPECIFIC_INCLUDE)); AII_KS_OS_MAJOR_SPECIFIC_INCLUDE };
+include debug('KS specific configuration for OS major version: '+to_string(AII_KS_OS_MAJOR_SPECIFIC_INCLUDE)); AII_KS_OS_MAJOR_SPECIFIC_INCLUDE;
 # Existence of OS_VERSION_PARAMS['minor'] is used a a QWG signature
 variable  AII_KS_OS_MINOR_SPECIFIC_INCLUDE ?= if ( is_defined(OS_VERSION_PARAMS['minor']) ) {
                                                      if_exists('config/quattor/ks');
                                                    } else {
                                                      undef;
                                                    };
-include { debug('KS specific configuration for OS minor release: '+to_string(AII_KS_OS_MINOR_SPECIFIC_INCLUDE)); AII_KS_OS_MINOR_SPECIFIC_INCLUDE };
+include debug('KS specific configuration for OS minor release: '+to_string(AII_KS_OS_MINOR_SPECIFIC_INCLUDE)); AII_KS_OS_MINOR_SPECIFIC_INCLUDE;
 
 #
 # For more details on Kickstart options see RedHat documentation:

diff --git a/quattor/aii/pxelinux/config.pan b/quattor/aii/pxelinux/config.pan
@@ -11,7 +11,7 @@
 #
 template quattor/aii/pxelinux/config;
 
-include {'quattor/aii/pxelinux/schema'};
+include 'quattor/aii/pxelinux/schema';
 
 
 #

diff --git a/quattor/aii/server/config.pan b/quattor/aii/server/config.pan
@@ -9,7 +9,7 @@ variable AII_DHCP_CONFIGURE ?= false;
 variable AII_DHCP_CONFIG_SITE ?= undef;
 variable AII_DHCP_DHCPD_CONF_FILE ?= '/etc/dhcpd.conf';
 
-include { 'components/aiiserver/config' };
+include 'components/aiiserver/config';
 
 # aii-shellfe configuration
 
@@ -66,4 +66,4 @@ prefix '/software/components/aiiserver/aii-dhcp';
                   null;
                 };     
 
-include {AII_DHCP_CONFIG_SITE};
+include AII_DHCP_CONFIG_SITE;
diff --git a/quattor/aii/server/rpms.pan b/quattor/aii/server/rpms.pan
@@ -11,10 +11,10 @@ required = no
 }
 variable AIISERVER_INSTALL_YUM_TOOLS ?= true;
 
-include { 'quattor/aii/rpms' };
-include { 'quattor/aii/dhcp/rpms' };
-include { 'quattor/aii/ks/rpms' };
-include { 'quattor/aii/pxelinux/rpms' };
+include 'quattor/aii/rpms';
+include 'quattor/aii/dhcp/rpms';
+include 'quattor/aii/ks/rpms';
+include 'quattor/aii/pxelinux/rpms';
 
 '/software/packages' = {
   if ( AIISERVER_INSTALL_YUM_TOOLS ) {

diff --git a/quattor/aii/server/service.pan b/quattor/aii/server/service.pan
@@ -1,8 +1,8 @@
 unique template quattor/aii/server/service;
 
 # Include RPMs 
-include { 'quattor/aii/server/rpms' };
+include 'quattor/aii/server/rpms';
 
 # Include base configuration
-include { 'quattor/aii/server/config' };
+include 'quattor/aii/server/config';
 
diff --git a/quattor/client/config.pan b/quattor/client/config.pan
@@ -30,14 +30,14 @@ variable RPMS_CONFIG_SUFFIX ?= '-yd';
 # Add RPMs for Quattor Client
 #
 
-include { 'quattor/client/rpms' };
+include 'quattor/client/rpms';
 
 
 #
 # Configure CCM and CDP
 #
 
-include { 'components/ccm/config' };
+include 'components/ccm/config';
 
 # Don't allow QUATTOR_PROFILE_URL to be undefined : no meaningful default
 variable QUATTOR_PROFILE_URL ?= {
@@ -51,6 +51,6 @@ variable QUATTOR_PROFILE_URL ?= {
                                               0;
                                             };
 
-include { 'components/cdp/config' };
+include 'components/cdp/config';
 "/software/components/cdp/fetch" = "/usr/sbin/ccm-fetch";
 "/software/components/cdp/fetch_smear" = 30;
diff --git a/quattor/client/rpms.pan b/quattor/client/rpms.pan
@@ -5,7 +5,7 @@
 
 unique template quattor/client/rpms;
 
-include { 'quattor/client/version' };
+include 'quattor/client/version';
 
 '/software/packages' = {
     # OS-provided required packages

diff --git a/quattor/functions/network.pan b/quattor/functions/network.pan
@@ -17,7 +17,7 @@
 
 declaration template quattor/functions/network;
 
-include { 'pan/types' };
+include 'pan/types';
 
 ################################################################################
 # set_interface_defaults

diff --git a/quattor/functions/repository.pan b/quattor/functions/repository.pan
@@ -17,7 +17,7 @@
 
 declaration template quattor/functions/repository;
 
-include { 'pan/functions' };
+include 'pan/functions';
 
 # Default namespace to use for repository templates.
 # Must be changed using function argument.

diff --git a/quattor/server/rpms.pan b/quattor/server/rpms.pan
@@ -3,7 +3,7 @@ unique template quattor/server/rpms;
 prefix '/software/packages';
 
 # Apache
-include { 'rpms/web_server' };
+include 'rpms/web_server';
 
 # DHCP
 '{dhcp}' = nlist();

diff --git a/quattor/server/service.pan b/quattor/server/service.pan
@@ -5,7 +5,7 @@ variable AII_NBP_DIR ?= '/tftpboot/quattor/pxelinux.cfg';
 variable AII_PROFILE_PREFIX ?= '';
 
 # Configure Quattor server
-include { 'quattor/aii/server/service' };
+include 'quattor/aii/server/service';
 
 # Include additional packages
-include { 'quattor/server/rpms' };
+include 'quattor/server/rpms';
diff --git a/quattor/server/yum_repos.pan b/quattor/server/yum_repos.pan
@@ -21,7 +21,7 @@ variable QUATTOR_YUM_UPDATE_REPOS_USER ?= 'root';
 variable QUATTOR_YUM_UPDATE_REPOS_INTERVAL ?= 2;
 
 # Configure cron entry
-include { 'components/cron/config' };
+include 'components/cron/config';
 "/software/components/cron/entries" = {
   if ( length(QUATTOR_RPM_REPOS_ROOTS) > 0 ) {
     command = "PATH=/sbin:/bin:/usr/sbin:/usr/bin; ";
@@ -43,7 +43,7 @@ include { 'components/cron/config' };
 
 
 # Configure logrotate
-include { 'components/altlogrotate/config' };
+include 'components/altlogrotate/config';
 "/software/components/altlogrotate/entries/update_yum_repos" =
   nlist("pattern", "/var/log/"+QUATTOR_YUM_UPDATE_REPOS_CRON+".ncm-cron.log",
         "compress", true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
     #
     template quattor/aii/pxelinux/config;
-    include {'quattor/aii/pxelinux/schema'};
+    include 'quattor/aii/pxelinux/schema';
     #
@@ Expand Down @@