From ec9dfc1bfbc3547a556cab92bed648cbb231a09f Mon Sep 17 00:00:00 2001 From: Victor Mendoza Date: Thu, 31 Oct 2013 10:34:27 +0100 Subject: [PATCH] Add templates for Quattor 13.1.2 --- components/accounts/config-common.pan | 4 +- components/accounts/config-rpm.pan | 4 +- components/accounts/config-xml.pan | 2 +- components/accounts/functions.pan | 2 +- components/afsclt/config-common.pan | 4 +- components/afsclt/config-rpm.pan | 2 +- components/afsclt/config-xml.pan | 2 +- components/afsclt/config.pan | 2 +- components/aiiserver/config-common.pan | 4 +- components/aiiserver/config-rpm.pan | 2 +- components/aiiserver/config-xml.pan | 2 +- components/aiiserver/config.pan | 2 +- components/alternatives/config-common.pan | 4 +- components/alternatives/config-rpm.pan | 4 +- components/alternatives/config-xml.pan | 2 +- components/alternatives/config.pan | 2 +- components/alternatives/schema.pan | 2 +- components/altlogrotate/config-common.pan | 4 +- components/altlogrotate/config-rpm.pan | 4 +- components/altlogrotate/config-xml.pan | 2 +- components/altlogrotate/config.pan | 2 +- components/amandaserver/config-common.pan | 4 +- components/amandaserver/config-rpm.pan | 2 +- components/amandaserver/config-xml.pan | 2 +- components/amandaserver/config.pan | 2 +- components/apel/config-common.pan | 31 ++ components/apel/config-rpm.pan | 30 ++ components/apel/config-xml.pan | 28 ++ components/apel/config.pan | 22 + components/apel/schema.pan | 96 ++++ components/authconfig/config-common.pan | 4 +- components/authconfig/config-rpm.pan | 2 +- components/authconfig/config-xml.pan | 2 +- components/authconfig/config.pan | 2 +- components/autofs/config-common.pan | 4 +- components/autofs/config-rpm.pan | 4 +- components/autofs/config-xml.pan | 2 +- components/autofs/config.pan | 2 +- components/ccm/config-common.pan | 4 +- components/ccm/config-rpm.pan | 4 +- components/ccm/config-xml.pan | 2 +- components/ccm/config.pan | 2 +- components/cdp/config-common.pan | 4 +- components/cdp/config-rpm.pan | 4 +- components/cdp/config-xml.pan | 2 +- components/cdp/config.pan | 2 +- components/chkconfig/config-common.pan | 4 +- components/chkconfig/config-rpm.pan | 2 +- components/chkconfig/config-xml.pan | 2 +- components/chkconfig/config.pan | 2 +- components/condorconfig/config-common.pan | 31 ++ components/condorconfig/config-rpm.pan | 30 ++ components/condorconfig/config-xml.pan | 28 ++ components/condorconfig/config.pan | 22 + components/condorconfig/schema.pan | 193 ++++++++ components/cron/config-common.pan | 4 +- components/cron/config-rpm.pan | 4 +- components/cron/config-xml.pan | 2 +- components/cron/config.pan | 2 +- components/cups/config-common.pan | 4 +- components/cups/config-rpm.pan | 4 +- components/cups/config-xml.pan | 2 +- components/dcache/config-common.pan | 31 ++ components/dcache/config-rpm.pan | 30 ++ components/dcache/config-xml.pan | 28 ++ components/dcache/config.pan | 22 + components/dcache/schema.pan | 243 ++++++++++ .../directoryservices/config-common.pan | 4 +- components/directoryservices/config-rpm.pan | 2 +- components/directoryservices/config-xml.pan | 2 +- components/directoryservices/config.pan | 2 +- components/dirperm/config-common.pan | 4 +- components/dirperm/config-rpm.pan | 4 +- components/dirperm/config-xml.pan | 2 +- components/dirperm/config.pan | 2 +- components/diskless_server/config-common.pan | 4 +- components/diskless_server/config-rpm.pan | 4 +- components/diskless_server/config-xml.pan | 2 +- components/diskless_server/config.pan | 2 +- components/download/config-common.pan | 4 +- components/download/config-rpm.pan | 4 +- components/download/config-xml.pan | 2 +- components/download/config.pan | 2 +- components/dpmlfc/config-common.pan | 31 ++ components/dpmlfc/config-rpm.pan | 30 ++ components/dpmlfc/config-xml.pan | 28 ++ components/dpmlfc/config.pan | 22 + components/dpmlfc/schema.pan | 197 +++++++++ components/drbd/config-common.pan | 4 +- components/drbd/config-rpm.pan | 4 +- components/drbd/config-xml.pan | 2 +- components/drbd/config.pan | 2 +- components/etcservices/config-common.pan | 4 +- components/etcservices/config-rpm.pan | 2 +- components/etcservices/config-xml.pan | 2 +- components/etcservices/config.pan | 2 +- components/filecopy/config-common.pan | 4 +- components/filecopy/config-rpm.pan | 4 +- components/filecopy/config-xml.pan | 2 +- components/filecopy/config.pan | 2 +- components/filesystems/config-common.pan | 4 +- components/filesystems/config-rpm.pan | 2 +- components/filesystems/config-xml.pan | 2 +- components/filesystems/config.pan | 2 +- components/fmonagent/config-common.pan | 4 +- components/fmonagent/config-rpm.pan | 4 +- components/fmonagent/config-xml.pan | 2 +- components/fmonagent/config.pan | 2 +- components/frontiersquid/config-common.pan | 31 ++ components/frontiersquid/config-rpm.pan | 30 ++ components/frontiersquid/config-xml.pan | 28 ++ components/frontiersquid/config.pan | 22 + components/frontiersquid/schema.pan | 38 ++ components/fsprobe/config-common.pan | 4 +- components/fsprobe/config-rpm.pan | 2 +- components/fsprobe/config-xml.pan | 2 +- components/fsprobe/config.pan | 2 +- components/fstab/config-common.pan | 4 +- components/fstab/config-rpm.pan | 2 +- components/fstab/config-xml.pan | 2 +- components/fstab/config.pan | 2 +- components/gacl/config-common.pan | 31 ++ components/gacl/config-rpm.pan | 30 ++ components/gacl/config-xml.pan | 28 ++ components/gacl/config.pan | 22 + components/gacl/schema.pan | 35 ++ components/ganglia/config-common.pan | 4 +- components/ganglia/config-rpm.pan | 4 +- components/ganglia/config-xml.pan | 2 +- components/ganglia/config.pan | 2 +- components/ganglia/schema.pan | 2 +- components/gip2/config-common.pan | 31 ++ components/gip2/config-rpm.pan | 30 ++ components/gip2/config-xml.pan | 28 ++ components/gip2/config.pan | 22 + components/gip2/schema.pan | 58 +++ components/glitestartup/config-common.pan | 32 ++ components/glitestartup/config-rpm.pan | 30 ++ components/glitestartup/config-xml.pan | 28 ++ components/glitestartup/config.pan | 22 + components/glitestartup/functions.pan | 97 ++++ components/glitestartup/schema.pan | 51 +++ components/globuscfg/config-common.pan | 31 ++ components/globuscfg/config-rpm.pan | 30 ++ components/globuscfg/config-xml.pan | 28 ++ components/globuscfg/config.pan | 22 + components/globuscfg/schema.pan | 130 ++++++ components/gmetad/config-common.pan | 4 +- components/gmetad/config-rpm.pan | 2 +- components/gmetad/config-xml.pan | 2 +- components/gmetad/config.pan | 2 +- components/gmond/config-common.pan | 4 +- components/gmond/config-rpm.pan | 2 +- components/gmond/config-xml.pan | 2 +- components/gmond/config.pan | 2 +- components/gold/config-common.pan | 31 ++ components/gold/config-rpm.pan | 30 ++ components/gold/config-xml.pan | 28 ++ components/gold/config.pan | 22 + components/gold/schema.pan | 148 +++++++ components/gpfs/config-common.pan | 4 +- components/gpfs/config-rpm.pan | 4 +- components/gpfs/config-xml.pan | 2 +- components/gpfs/config.pan | 2 +- components/gridmapdir/config-common.pan | 31 ++ components/gridmapdir/config-rpm.pan | 30 ++ components/gridmapdir/config-xml.pan | 28 ++ components/gridmapdir/config.pan | 22 + components/gridmapdir/schema.pan | 35 ++ components/grub/config-common.pan | 4 +- components/grub/config-rpm.pan | 2 +- components/grub/config-xml.pan | 2 +- components/grub/config.pan | 2 +- components/gsissh/config-common.pan | 31 ++ components/gsissh/config-rpm.pan | 30 ++ components/gsissh/config-xml.pan | 28 ++ components/gsissh/config.pan | 22 + components/gsissh/schema.pan | 44 ++ components/hostsaccess/config-common.pan | 4 +- components/hostsaccess/config-rpm.pan | 4 +- components/hostsaccess/config-xml.pan | 2 +- components/hostsaccess/config.pan | 2 +- components/hostsfile/config-common.pan | 4 +- components/hostsfile/config-rpm.pan | 4 +- components/hostsfile/config-xml.pan | 2 +- components/hostsfile/config.pan | 2 +- components/icinga/config-common.pan | 4 +- components/icinga/config-rpm.pan | 4 +- components/icinga/config-xml.pan | 2 +- components/icinga/config.pan | 2 +- components/icinga/functions.pan | 2 +- components/icinga/schema.pan | 2 +- .../interactivelimits/config-common.pan | 4 +- components/interactivelimits/config-rpm.pan | 2 +- components/interactivelimits/config-xml.pan | 2 +- components/interactivelimits/config.pan | 2 +- components/ipmi/config-common.pan | 4 +- components/ipmi/config-rpm.pan | 4 +- components/ipmi/config-xml.pan | 2 +- components/ipmi/config.pan | 2 +- components/iptables/config-common.pan | 4 +- components/iptables/config-rpm.pan | 2 +- components/iptables/config-xml.pan | 2 +- components/iptables/config.pan | 2 +- components/iscsitarget/config-common.pan | 4 +- components/iscsitarget/config-rpm.pan | 2 +- components/iscsitarget/config-xml.pan | 2 +- components/iscsitarget/config.pan | 2 +- components/krb5clt/config-common.pan | 4 +- components/krb5clt/config-rpm.pan | 2 +- components/krb5clt/config-xml.pan | 2 +- components/krb5clt/config.pan | 2 +- components/lbconfig/config-common.pan | 31 ++ components/lbconfig/config-rpm.pan | 30 ++ components/lbconfig/config-xml.pan | 28 ++ components/lbconfig/config.pan | 22 + components/lbconfig/schema.pan | 33 ++ components/lcas/config-common.pan | 31 ++ components/lcas/config-rpm.pan | 30 ++ components/lcas/config-xml.pan | 28 ++ components/lcas/config.pan | 22 + components/lcas/schema.pan | 73 +++ components/lcgbdii/config-common.pan | 31 ++ components/lcgbdii/config-rpm.pan | 30 ++ components/lcgbdii/config-xml.pan | 28 ++ components/lcgbdii/config.pan | 22 + components/lcgbdii/schema.pan | 98 ++++ components/lcgmonjob/config-common.pan | 31 ++ components/lcgmonjob/config-rpm.pan | 30 ++ components/lcgmonjob/config-xml.pan | 28 ++ components/lcgmonjob/config.pan | 22 + components/lcgmonjob/schema.pan | 33 ++ components/lcmaps/config-common.pan | 31 ++ components/lcmaps/config-rpm.pan | 30 ++ components/lcmaps/config-xml.pan | 28 ++ components/lcmaps/config.pan | 22 + components/lcmaps/schema.pan | 82 ++++ components/ldconf/config-common.pan | 4 +- components/ldconf/config-rpm.pan | 4 +- components/ldconf/config-xml.pan | 2 +- components/ldconf/config.pan | 2 +- .../libvirtd/{config.tpl => config.pan} | 4 +- .../libvirtd/{schema.tpl => schema.pan} | 2 +- components/linuxha/config-common.pan | 4 +- components/linuxha/config-rpm.pan | 2 +- components/linuxha/config-xml.pan | 2 +- components/linuxha/config.pan | 2 +- components/mailaliases/config-common.pan | 4 +- components/mailaliases/config-rpm.pan | 2 +- components/mailaliases/config-xml.pan | 2 +- components/mailaliases/config.pan | 2 +- components/maui/config-common.pan | 31 ++ components/maui/config-rpm.pan | 30 ++ components/maui/config-xml.pan | 28 ++ components/maui/config.pan | 22 + components/maui/schema.pan | 34 ++ components/mcx/config-common.pan | 4 +- components/mcx/config-rpm.pan | 2 +- components/mcx/config-xml.pan | 2 +- components/mcx/config.pan | 2 +- components/metaconfig/config-common.pan | 4 +- components/metaconfig/config-rpm.pan | 4 +- components/metaconfig/config-xml.pan | 2 +- components/metaconfig/config.pan | 2 +- components/metaconfig/schema.pan | 2 +- components/mkgridmap/config-common.pan | 31 ++ components/mkgridmap/config-rpm.pan | 30 ++ components/mkgridmap/config-xml.pan | 28 ++ components/mkgridmap/config.pan | 22 + components/mkgridmap/schema.pan | 58 +++ components/moab/config-common.pan | 31 ++ components/moab/config-rpm.pan | 30 ++ components/moab/config-xml.pan | 28 ++ components/moab/config.pan | 22 + components/moab/schema.pan | 66 +++ components/modprobe/config-common.pan | 4 +- components/modprobe/config-rpm.pan | 2 +- components/modprobe/config-xml.pan | 2 +- components/modprobe/config.pan | 2 +- components/myproxy/config-common.pan | 31 ++ components/myproxy/config-rpm.pan | 30 ++ components/myproxy/config-xml.pan | 28 ++ components/myproxy/config.pan | 22 + components/myproxy/schema.pan | 54 +++ components/mysql/config-common.pan | 4 +- components/mysql/config-rpm.pan | 4 +- components/mysql/config-xml.pan | 2 +- components/mysql/config.pan | 2 +- components/nagios/config-common.pan | 4 +- components/nagios/config-rpm.pan | 2 +- components/nagios/config-xml.pan | 2 +- components/nagios/config.pan | 2 +- components/named/config-common.pan | 4 +- components/named/config-rpm.pan | 4 +- components/named/config-xml.pan | 2 +- components/named/config.pan | 2 +- components/network/config-common.pan | 4 +- components/network/config-rpm.pan | 4 +- components/network/config-xml.pan | 2 +- components/network/config.pan | 2 +- components/network/schema.pan | 2 +- components/networkupstools/config-common.pan | 4 +- components/networkupstools/config-rpm.pan | 2 +- components/networkupstools/config-xml.pan | 2 +- components/networkupstools/config.pan | 2 +- components/nfs/config-common.pan | 4 +- components/nfs/config-rpm.pan | 4 +- components/nfs/config-xml.pan | 2 +- components/nfs/config.pan | 2 +- components/nrpe/config-common.pan | 4 +- components/nrpe/config-rpm.pan | 2 +- components/nrpe/config-xml.pan | 2 +- components/nrpe/config.pan | 2 +- components/nsca/config-common.pan | 4 +- components/nsca/config-rpm.pan | 2 +- components/nsca/config-xml.pan | 2 +- components/nsca/config.pan | 2 +- components/nscd/config-common.pan | 4 +- components/nscd/config-rpm.pan | 2 +- components/nscd/config-xml.pan | 2 +- components/nscd/config.pan | 2 +- components/ntpd/config-common.pan | 4 +- components/ntpd/config-rpm.pan | 4 +- components/ntpd/config-xml.pan | 2 +- components/ntpd/config.pan | 2 +- components/ofed/config-common.pan | 4 +- components/ofed/config-rpm.pan | 4 +- components/ofed/config-xml.pan | 2 +- components/ofed/config.pan | 2 +- components/openldap/config-common.pan | 4 +- components/openldap/config-rpm.pan | 4 +- components/openldap/config-xml.pan | 2 +- components/openldap/config.pan | 2 +- components/openldap/schema.pan | 105 ++--- components/openvpn/config-common.pan | 4 +- components/openvpn/config-rpm.pan | 2 +- components/openvpn/config-xml.pan | 2 +- components/openvpn/config.pan | 2 +- components/openvpn/schema.pan | 2 +- components/oramonserver/config-common.pan | 4 +- components/oramonserver/config-rpm.pan | 2 +- components/oramonserver/config-xml.pan | 2 +- components/oramonserver/config.pan | 2 +- components/pacemaker/config-common.pan | 4 +- components/pacemaker/config-rpm.pan | 2 +- components/pacemaker/config-xml.pan | 2 +- components/pacemaker/config.pan | 2 +- components/pakiti/config-common.pan | 4 +- components/pakiti/config-rpm.pan | 2 +- components/pakiti/config-xml.pan | 2 +- components/pakiti/config.pan | 2 +- components/pam/config-common.pan | 4 +- components/pam/config-rpm.pan | 4 +- components/pam/config-xml.pan | 2 +- components/pam/config.pan | 2 +- components/pbsclient/config-common.pan | 31 ++ components/pbsclient/config-rpm.pan | 30 ++ components/pbsclient/config-xml.pan | 28 ++ components/pbsclient/config.pan | 22 + components/pbsclient/schema.pan | 172 +++++++ components/pbsknownhosts/config-common.pan | 31 ++ components/pbsknownhosts/config-rpm.pan | 30 ++ components/pbsknownhosts/config-xml.pan | 28 ++ components/pbsknownhosts/config.pan | 22 + components/pbsknownhosts/schema.pan | 39 ++ components/pbsserver/config-common.pan | 31 ++ components/pbsserver/config-rpm.pan | 30 ++ components/pbsserver/config-xml.pan | 28 ++ components/pbsserver/config.pan | 22 + components/pbsserver/schema.pan | 259 +++++++++++ components/php/config-common.pan | 4 +- components/php/config-rpm.pan | 4 +- components/php/config-xml.pan | 2 +- components/php/config.pan | 2 +- components/pine/config-common.pan | 4 +- components/pine/config-rpm.pan | 2 +- components/pine/config-xml.pan | 2 +- components/pine/config.pan | 2 +- components/pnp4nagios/config-common.pan | 4 +- components/pnp4nagios/config-rpm.pan | 2 +- components/pnp4nagios/config-xml.pan | 2 +- components/pnp4nagios/config.pan | 2 +- components/portmap/config-common.pan | 4 +- components/portmap/config-rpm.pan | 4 +- components/portmap/config-xml.pan | 2 +- components/portmap/config.pan | 2 +- components/postfix/config-common.pan | 2 +- components/postfix/config-rpm.pan | 4 +- components/postfix/config-xml.pan | 2 +- components/postfix/config.pan | 2 +- components/postfix/schema.pan | 2 +- components/postgresql/config-common.pan | 4 +- components/postgresql/config-rpm.pan | 2 +- components/postgresql/config-xml.pan | 2 +- components/postgresql/config.pan | 2 +- components/profile/config-common.pan | 4 +- components/profile/config-rpm.pan | 4 +- components/profile/config-xml.pan | 2 +- components/profile/config.pan | 2 +- components/pvss/config-common.pan | 4 +- components/pvss/config-rpm.pan | 2 +- components/pvss/config-xml.pan | 2 +- components/pvss/config.pan | 2 +- components/raidman/config-common.pan | 4 +- components/raidman/config-rpm.pan | 4 +- components/raidman/config-xml.pan | 2 +- components/raidman/config.pan | 2 +- components/raidman/schema.pan | 2 +- components/resolver/config-common.pan | 4 +- components/resolver/config-rpm.pan | 4 +- components/resolver/config-xml.pan | 2 +- components/resolver/config.pan | 2 +- components/rproxy/config-common.pan | 4 +- components/rproxy/config-rpm.pan | 4 +- components/rproxy/config-xml.pan | 2 +- components/rproxy/config.pan | 2 +- components/rproxy/schema.pan | 2 +- components/runlevel/config-common.pan | 4 +- components/runlevel/config-rpm.pan | 2 +- components/runlevel/config-xml.pan | 2 +- components/runlevel/config.pan | 2 +- components/selinux/config-common.pan | 4 +- components/selinux/config-rpm.pan | 4 +- components/selinux/config-xml.pan | 2 +- components/selinux/config.pan | 2 +- components/selinux/schema.pan | 2 +- components/sendmail/config-common.pan | 4 +- components/sendmail/config-rpm.pan | 2 +- components/sendmail/config-xml.pan | 2 +- components/sendmail/config.pan | 2 +- components/serialclient/config-common.pan | 4 +- components/serialclient/config-rpm.pan | 4 +- components/serialclient/config-xml.pan | 2 +- components/serialclient/config.pan | 2 +- components/serialclient/schema.pan | 2 +- components/shorewall/config-common.pan | 4 +- components/shorewall/config-rpm.pan | 4 +- components/shorewall/config-xml.pan | 2 +- components/shorewall/config.pan | 2 +- components/sindes_getcert/config-common.pan | 4 +- components/sindes_getcert/config-rpm.pan | 2 +- components/sindes_getcert/config-xml.pan | 2 +- components/sindes_getcert/config.pan | 2 +- components/slocate/config-common.pan | 4 +- components/slocate/config-rpm.pan | 4 +- components/slocate/config-xml.pan | 2 +- components/slocate/config.pan | 2 +- components/slocate/schema.pan | 2 +- components/spma/config-common.pan | 4 +- components/spma/config-rpm.pan | 2 +- components/spma/config-xml.pan | 2 +- components/spma/config.pan | 2 +- components/spma/schema.pan | 24 +- components/squid/config-common.pan | 4 +- components/squid/config-rpm.pan | 2 +- components/squid/config-xml.pan | 2 +- components/squid/config.pan | 2 +- components/srvtab/config-common.pan | 4 +- components/srvtab/config-rpm.pan | 2 +- components/srvtab/config-xml.pan | 2 +- components/srvtab/config.pan | 2 +- components/ssh/config-common.pan | 4 +- components/ssh/config-rpm.pan | 4 +- components/ssh/config-xml.pan | 2 +- components/ssh/config.pan | 2 +- components/sshkeys/config-common.pan | 4 +- components/sshkeys/config-rpm.pan | 4 +- components/sshkeys/config-xml.pan | 2 +- components/sshkeys/config.pan | 2 +- components/state/config-common.pan | 4 +- components/state/config-rpm.pan | 4 +- components/state/config-xml.pan | 2 +- components/state/config.pan | 2 +- components/state/schema.pan | 2 +- components/sudo/config-common.pan | 4 +- components/sudo/config-rpm.pan | 2 +- components/sudo/config-xml.pan | 2 +- components/sudo/config.pan | 2 +- components/sudo/schema.pan | 2 +- components/symlink/config-common.pan | 4 +- components/symlink/config-rpm.pan | 2 +- components/symlink/config-xml.pan | 2 +- components/symlink/config.pan | 2 +- components/sysconfig/config-common.pan | 4 +- components/sysconfig/config-rpm.pan | 4 +- components/sysconfig/config-xml.pan | 2 +- components/sysconfig/config.pan | 2 +- components/sysctl/config-common.pan | 4 +- components/sysctl/config-rpm.pan | 2 +- components/sysctl/config-xml.pan | 2 +- components/sysctl/config.pan | 2 +- components/syslog/config-common.pan | 4 +- components/syslog/config-rpm.pan | 2 +- components/syslog/config-xml.pan | 2 +- components/syslog/config.pan | 2 +- components/syslogng/config-common.pan | 4 +- components/syslogng/config-rpm.pan | 2 +- components/syslogng/config-xml.pan | 2 +- components/syslogng/config.pan | 2 +- components/tftpd/config-common.pan | 4 +- components/tftpd/config-rpm.pan | 2 +- components/tftpd/config-xml.pan | 2 +- components/tftpd/config.pan | 2 +- components/tomcat/config-common.pan | 4 +- components/tomcat/config-rpm.pan | 4 +- components/tomcat/config-xml.pan | 2 +- components/tomcat/config.pan | 2 +- components/useraccess/config-common.pan | 4 +- components/useraccess/config-rpm.pan | 2 +- components/useraccess/config-xml.pan | 2 +- components/useraccess/config.pan | 2 +- components/vomrs/config-common.pan | 31 ++ components/vomrs/config-rpm.pan | 30 ++ components/vomrs/config-xml.pan | 28 ++ components/vomrs/config.pan | 22 + components/vomrs/schema.pan | 62 +++ components/vomsclient/config-common.pan | 31 ++ components/vomsclient/config-rpm.pan | 30 ++ components/vomsclient/config-xml.pan | 28 ++ components/vomsclient/config.pan | 22 + components/vomsclient/schema.pan | 45 ++ components/wlconfig/config-common.pan | 31 ++ components/wlconfig/config-rpm.pan | 30 ++ components/wlconfig/config-xml.pan | 28 ++ components/wlconfig/config.pan | 22 + components/wlconfig/schema.pan | 103 +++++ components/wmsclient/config-common.pan | 31 ++ components/wmsclient/config-rpm.pan | 30 ++ components/wmsclient/config-xml.pan | 28 ++ components/wmsclient/config.pan | 22 + components/wmsclient/schema.pan | 64 +++ components/wmslb/config-common.pan | 31 ++ components/wmslb/config-rpm.pan | 30 ++ components/wmslb/config-xml.pan | 28 ++ components/wmslb/config.pan | 22 + components/wmslb/schema.pan | 397 +++++++++++++++++ components/xen/config-common.pan | 4 +- components/xen/config-rpm.pan | 2 +- components/xen/config-xml.pan | 2 +- components/xen/config.pan | 2 +- components/xrootd/config-common.pan | 31 ++ components/xrootd/config-rpm.pan | 30 ++ components/xrootd/config-xml.pan | 28 ++ components/xrootd/config.pan | 22 + components/xrootd/schema.pan | 230 ++++++++++ components/yaim/config-common.pan | 31 ++ components/yaim/config-rpm.pan | 30 ++ components/yaim/config-xml.pan | 28 ++ components/yaim/config.pan | 22 + components/yaim/schema.pan | 418 ++++++++++++++++++ components/yaim_usersconf/config-common.pan | 31 ++ components/yaim_usersconf/config-rpm.pan | 30 ++ components/yaim_usersconf/config-xml.pan | 28 ++ components/yaim_usersconf/config.pan | 22 + components/yaim_usersconf/schema.pan | 63 +++ components/zephyrclt/config-common.pan | 4 +- components/zephyrclt/config-rpm.pan | 4 +- components/zephyrclt/config-xml.pan | 2 +- components/zephyrclt/config.pan | 2 +- components/zephyrclt/schema.pan | 2 +- quattor/aii/config.pan | 75 ++++ quattor/aii/dhcp/config.pan | 2 +- quattor/aii/dhcp/rpms.pan | 4 +- quattor/aii/dhcp/schema.pan | 2 +- quattor/aii/ks/config.pan | 22 +- quattor/aii/ks/rpms.pan | 4 +- quattor/aii/ks/schema.pan | 12 +- quattor/aii/ks/variants/fedora14.pan | 2 +- quattor/aii/ks/variants/sl6.pan | 2 +- quattor/aii/pxelinux/config.pan | 2 +- quattor/aii/pxelinux/rpms.pan | 4 +- quattor/aii/pxelinux/schema.pan | 2 +- quattor/aii/rpms.pan | 17 + quattor/aii/schema.pan | 15 + quattor/client/rpms.pan | 26 +- 575 files changed, 8026 insertions(+), 673 deletions(-) create mode 100644 components/apel/config-common.pan create mode 100644 components/apel/config-rpm.pan create mode 100644 components/apel/config-xml.pan create mode 100644 components/apel/config.pan create mode 100644 components/apel/schema.pan create mode 100644 components/condorconfig/config-common.pan create mode 100644 components/condorconfig/config-rpm.pan create mode 100644 components/condorconfig/config-xml.pan create mode 100644 components/condorconfig/config.pan create mode 100644 components/condorconfig/schema.pan create mode 100644 components/dcache/config-common.pan create mode 100644 components/dcache/config-rpm.pan create mode 100644 components/dcache/config-xml.pan create mode 100644 components/dcache/config.pan create mode 100644 components/dcache/schema.pan create mode 100644 components/dpmlfc/config-common.pan create mode 100644 components/dpmlfc/config-rpm.pan create mode 100644 components/dpmlfc/config-xml.pan create mode 100644 components/dpmlfc/config.pan create mode 100644 components/dpmlfc/schema.pan create mode 100644 components/frontiersquid/config-common.pan create mode 100644 components/frontiersquid/config-rpm.pan create mode 100644 components/frontiersquid/config-xml.pan create mode 100644 components/frontiersquid/config.pan create mode 100644 components/frontiersquid/schema.pan create mode 100644 components/gacl/config-common.pan create mode 100644 components/gacl/config-rpm.pan create mode 100644 components/gacl/config-xml.pan create mode 100644 components/gacl/config.pan create mode 100644 components/gacl/schema.pan create mode 100644 components/gip2/config-common.pan create mode 100644 components/gip2/config-rpm.pan create mode 100644 components/gip2/config-xml.pan create mode 100644 components/gip2/config.pan create mode 100644 components/gip2/schema.pan create mode 100644 components/glitestartup/config-common.pan create mode 100644 components/glitestartup/config-rpm.pan create mode 100644 components/glitestartup/config-xml.pan create mode 100644 components/glitestartup/config.pan create mode 100644 components/glitestartup/functions.pan create mode 100644 components/glitestartup/schema.pan create mode 100644 components/globuscfg/config-common.pan create mode 100644 components/globuscfg/config-rpm.pan create mode 100644 components/globuscfg/config-xml.pan create mode 100644 components/globuscfg/config.pan create mode 100644 components/globuscfg/schema.pan create mode 100644 components/gold/config-common.pan create mode 100644 components/gold/config-rpm.pan create mode 100644 components/gold/config-xml.pan create mode 100644 components/gold/config.pan create mode 100644 components/gold/schema.pan create mode 100644 components/gridmapdir/config-common.pan create mode 100644 components/gridmapdir/config-rpm.pan create mode 100644 components/gridmapdir/config-xml.pan create mode 100644 components/gridmapdir/config.pan create mode 100644 components/gridmapdir/schema.pan create mode 100644 components/gsissh/config-common.pan create mode 100644 components/gsissh/config-rpm.pan create mode 100644 components/gsissh/config-xml.pan create mode 100644 components/gsissh/config.pan create mode 100644 components/gsissh/schema.pan create mode 100644 components/lbconfig/config-common.pan create mode 100644 components/lbconfig/config-rpm.pan create mode 100644 components/lbconfig/config-xml.pan create mode 100644 components/lbconfig/config.pan create mode 100644 components/lbconfig/schema.pan create mode 100644 components/lcas/config-common.pan create mode 100644 components/lcas/config-rpm.pan create mode 100644 components/lcas/config-xml.pan create mode 100644 components/lcas/config.pan create mode 100644 components/lcas/schema.pan create mode 100644 components/lcgbdii/config-common.pan create mode 100644 components/lcgbdii/config-rpm.pan create mode 100644 components/lcgbdii/config-xml.pan create mode 100644 components/lcgbdii/config.pan create mode 100644 components/lcgbdii/schema.pan create mode 100644 components/lcgmonjob/config-common.pan create mode 100644 components/lcgmonjob/config-rpm.pan create mode 100644 components/lcgmonjob/config-xml.pan create mode 100644 components/lcgmonjob/config.pan create mode 100644 components/lcgmonjob/schema.pan create mode 100644 components/lcmaps/config-common.pan create mode 100644 components/lcmaps/config-rpm.pan create mode 100644 components/lcmaps/config-xml.pan create mode 100644 components/lcmaps/config.pan create mode 100644 components/lcmaps/schema.pan rename components/libvirtd/{config.tpl => config.pan} (83%) rename components/libvirtd/{schema.tpl => schema.pan} (98%) create mode 100644 components/maui/config-common.pan create mode 100644 components/maui/config-rpm.pan create mode 100644 components/maui/config-xml.pan create mode 100644 components/maui/config.pan create mode 100644 components/maui/schema.pan create mode 100644 components/mkgridmap/config-common.pan create mode 100644 components/mkgridmap/config-rpm.pan create mode 100644 components/mkgridmap/config-xml.pan create mode 100644 components/mkgridmap/config.pan create mode 100644 components/mkgridmap/schema.pan create mode 100644 components/moab/config-common.pan create mode 100644 components/moab/config-rpm.pan create mode 100644 components/moab/config-xml.pan create mode 100644 components/moab/config.pan create mode 100644 components/moab/schema.pan create mode 100644 components/myproxy/config-common.pan create mode 100644 components/myproxy/config-rpm.pan create mode 100644 components/myproxy/config-xml.pan create mode 100644 components/myproxy/config.pan create mode 100644 components/myproxy/schema.pan create mode 100644 components/pbsclient/config-common.pan create mode 100644 components/pbsclient/config-rpm.pan create mode 100644 components/pbsclient/config-xml.pan create mode 100644 components/pbsclient/config.pan create mode 100644 components/pbsclient/schema.pan create mode 100644 components/pbsknownhosts/config-common.pan create mode 100644 components/pbsknownhosts/config-rpm.pan create mode 100644 components/pbsknownhosts/config-xml.pan create mode 100644 components/pbsknownhosts/config.pan create mode 100644 components/pbsknownhosts/schema.pan create mode 100644 components/pbsserver/config-common.pan create mode 100644 components/pbsserver/config-rpm.pan create mode 100644 components/pbsserver/config-xml.pan create mode 100644 components/pbsserver/config.pan create mode 100644 components/pbsserver/schema.pan create mode 100644 components/vomrs/config-common.pan create mode 100644 components/vomrs/config-rpm.pan create mode 100644 components/vomrs/config-xml.pan create mode 100644 components/vomrs/config.pan create mode 100644 components/vomrs/schema.pan create mode 100644 components/vomsclient/config-common.pan create mode 100644 components/vomsclient/config-rpm.pan create mode 100644 components/vomsclient/config-xml.pan create mode 100644 components/vomsclient/config.pan create mode 100644 components/vomsclient/schema.pan create mode 100644 components/wlconfig/config-common.pan create mode 100644 components/wlconfig/config-rpm.pan create mode 100644 components/wlconfig/config-xml.pan create mode 100644 components/wlconfig/config.pan create mode 100644 components/wlconfig/schema.pan create mode 100644 components/wmsclient/config-common.pan create mode 100644 components/wmsclient/config-rpm.pan create mode 100644 components/wmsclient/config-xml.pan create mode 100644 components/wmsclient/config.pan create mode 100644 components/wmsclient/schema.pan create mode 100644 components/wmslb/config-common.pan create mode 100644 components/wmslb/config-rpm.pan create mode 100644 components/wmslb/config-xml.pan create mode 100644 components/wmslb/config.pan create mode 100644 components/wmslb/schema.pan create mode 100644 components/xrootd/config-common.pan create mode 100644 components/xrootd/config-rpm.pan create mode 100644 components/xrootd/config-xml.pan create mode 100644 components/xrootd/config.pan create mode 100644 components/xrootd/schema.pan create mode 100644 components/yaim/config-common.pan create mode 100644 components/yaim/config-rpm.pan create mode 100644 components/yaim/config-xml.pan create mode 100644 components/yaim/config.pan create mode 100644 components/yaim/schema.pan create mode 100644 components/yaim_usersconf/config-common.pan create mode 100644 components/yaim_usersconf/config-rpm.pan create mode 100644 components/yaim_usersconf/config-xml.pan create mode 100644 components/yaim_usersconf/config.pan create mode 100644 components/yaim_usersconf/schema.pan create mode 100644 quattor/aii/config.pan create mode 100644 quattor/aii/rpms.pan create mode 100644 quattor/aii/schema.pan diff --git a/components/accounts/config-common.pan b/components/accounts/config-common.pan index 25846dbaa..119bd0a61 100644 --- a/components/accounts/config-common.pan +++ b/components/accounts/config-common.pan @@ -11,7 +11,7 @@ # # # - # accounts, 13.9.0, 1, 20130911-1927 + # accounts, 13.1.2, 1, 20131015-1106 # unique template components/accounts/config-common; @@ -21,7 +21,7 @@ include { 'components/accounts/schema' }; # Set prefix to root of component configuration. prefix '/software/components/accounts'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/accounts/config-rpm.pan b/components/accounts/config-rpm.pan index af7f96f81..59883ffb0 100644 --- a/components/accounts/config-rpm.pan +++ b/components/accounts/config-rpm.pan @@ -18,11 +18,11 @@ include { 'components/accounts/functions' }; include { 'components/accounts/config-common'}; # Package to install -"/software/packages" = pkg_repl("ncm-accounts", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-accounts", "13.1.2-1", "noarch"); '/software/components/accounts/dependencies/pre' ?= list('spma'); -'/software/components/accounts/version' = '13.9.0'; +'/software/components/accounts/version' = '13.1.2'; # Include system users and groups which shouldn't be removed # by default. The machine configuration can still modify or diff --git a/components/accounts/config-xml.pan b/components/accounts/config-xml.pan index 78523d32b..4e334ba10 100644 --- a/components/accounts/config-xml.pan +++ b/components/accounts/config-xml.pan @@ -11,7 +11,7 @@ # # # - # accounts, 13.9.0, 1, 20130911-1927 + # accounts, 13.1.2, 1, 20131015-1106 # unique template components/accounts/config-xml; diff --git a/components/accounts/functions.pan b/components/accounts/functions.pan index d0d8e1bbd..bb321cfcf 100644 --- a/components/accounts/functions.pan +++ b/components/accounts/functions.pan @@ -11,7 +11,7 @@ # # # - # accounts, 13.9.0, 1, 20130911-1927 + # accounts, 13.1.2, 1, 20131015-1106 # declaration template components/accounts/functions; diff --git a/components/afsclt/config-common.pan b/components/afsclt/config-common.pan index e5a96ec80..903808558 100644 --- a/components/afsclt/config-common.pan +++ b/components/afsclt/config-common.pan @@ -14,7 +14,7 @@ # # # - # afsclt, 13.9.0, 1, 20130911-1927 + # afsclt, 13.1.2, 1, 20131015-1106 # unique template components/afsclt/config-common; @@ -24,7 +24,7 @@ include { 'components/afsclt/schema' }; # Set prefix to root of component configuration. prefix '/software/components/afsclt'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/afsclt/config-rpm.pan b/components/afsclt/config-rpm.pan index eaf24ff59..3c59ebf19 100644 --- a/components/afsclt/config-rpm.pan +++ b/components/afsclt/config-rpm.pan @@ -21,7 +21,7 @@ unique template components/afsclt/config-rpm; include { 'components/afsclt/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-afsclt", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-afsclt", "13.1.2-1", "noarch"); "/software/components/afsclt/dependencies/pre" ?= list("spma"); diff --git a/components/afsclt/config-xml.pan b/components/afsclt/config-xml.pan index b7e0b539c..ac772cfd7 100644 --- a/components/afsclt/config-xml.pan +++ b/components/afsclt/config-xml.pan @@ -14,7 +14,7 @@ # # # - # afsclt, 13.9.0, 1, 20130911-1927 + # afsclt, 13.1.2, 1, 20131015-1106 # unique template components/afsclt/config-xml; diff --git a/components/afsclt/config.pan b/components/afsclt/config.pan index 52296bc02..c3bab5f50 100644 --- a/components/afsclt/config.pan +++ b/components/afsclt/config.pan @@ -14,7 +14,7 @@ # # # - # afsclt, 13.9.0, 1, 20130911-1927 + # afsclt, 13.1.2, 1, 20131015-1106 # unique template components/afsclt/config; diff --git a/components/aiiserver/config-common.pan b/components/aiiserver/config-common.pan index 80e657aa0..c31affd78 100644 --- a/components/aiiserver/config-common.pan +++ b/components/aiiserver/config-common.pan @@ -11,7 +11,7 @@ # # # - # aiiserver, 13.9.0, 1, 20130911-1927 + # aiiserver, 13.1.2, 1, 20131015-1106 # unique template components/aiiserver/config-common; @@ -21,7 +21,7 @@ include { 'components/aiiserver/schema' }; # Set prefix to root of component configuration. prefix '/software/components/aiiserver'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/aiiserver/config-rpm.pan b/components/aiiserver/config-rpm.pan index bcfbb9d32..31680d079 100644 --- a/components/aiiserver/config-rpm.pan +++ b/components/aiiserver/config-rpm.pan @@ -15,7 +15,7 @@ unique template components/aiiserver/config-rpm; include {'components/aiiserver/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-aiiserver", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-aiiserver", "13.1.2-1", "noarch"); "/software/components/aiiserver/dependencies/pre" ?= list ("spma"); diff --git a/components/aiiserver/config-xml.pan b/components/aiiserver/config-xml.pan index d4bb6edb1..2af31f67a 100644 --- a/components/aiiserver/config-xml.pan +++ b/components/aiiserver/config-xml.pan @@ -11,7 +11,7 @@ # # # - # aiiserver, 13.9.0, 1, 20130911-1927 + # aiiserver, 13.1.2, 1, 20131015-1106 # unique template components/aiiserver/config-xml; diff --git a/components/aiiserver/config.pan b/components/aiiserver/config.pan index 92ab95951..696de5c85 100644 --- a/components/aiiserver/config.pan +++ b/components/aiiserver/config.pan @@ -11,7 +11,7 @@ # # # - # aiiserver, 13.9.0, 1, 20130911-1927 + # aiiserver, 13.1.2, 1, 20131015-1106 # unique template components/aiiserver/config; diff --git a/components/alternatives/config-common.pan b/components/alternatives/config-common.pan index d995b70ef..ad1694132 100644 --- a/components/alternatives/config-common.pan +++ b/components/alternatives/config-common.pan @@ -14,7 +14,7 @@ # # # - # alternatives, 13.9.0, 1, 20130911-1927 + # alternatives, 13.1.2, 1, 20131015-1106 # unique template components/alternatives/config-common; @@ -24,7 +24,7 @@ include { 'components/alternatives/schema' }; # Set prefix to root of component configuration. prefix '/software/components/alternatives'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/alternatives/config-rpm.pan b/components/alternatives/config-rpm.pan index 0f8a3899f..a64870dcf 100644 --- a/components/alternatives/config-rpm.pan +++ b/components/alternatives/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # alternatives, 13.9.0, 1, 20130911-1927 + # alternatives, 13.1.2, 1, 20131015-1106 # unique template components/alternatives/config-rpm; @@ -25,7 +25,7 @@ include { 'components/alternatives/config-common' }; prefix '/software/components/alternatives'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-alternatives", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-alternatives", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/alternatives/config-xml.pan b/components/alternatives/config-xml.pan index c647dfa11..d5c9cbba7 100644 --- a/components/alternatives/config-xml.pan +++ b/components/alternatives/config-xml.pan @@ -14,7 +14,7 @@ # # # - # alternatives, 13.9.0, 1, 20130911-1927 + # alternatives, 13.1.2, 1, 20131015-1106 # unique template components/alternatives/config-xml; diff --git a/components/alternatives/config.pan b/components/alternatives/config.pan index 183e624a2..b121f6697 100644 --- a/components/alternatives/config.pan +++ b/components/alternatives/config.pan @@ -14,7 +14,7 @@ # # # - # alternatives, 13.9.0, 1, 20130911-1927 + # alternatives, 13.1.2, 1, 20131015-1106 # unique template components/alternatives/config; diff --git a/components/alternatives/schema.pan b/components/alternatives/schema.pan index 362b13f6e..bb4aaef42 100644 --- a/components/alternatives/schema.pan +++ b/components/alternatives/schema.pan @@ -14,7 +14,7 @@ # # # - # alternatives, 13.9.0, 1, 20130911-1927 + # alternatives, 13.1.2, 1, 20131015-1106 # declaration template components/alternatives/schema; diff --git a/components/altlogrotate/config-common.pan b/components/altlogrotate/config-common.pan index 6bb6296e3..63e4704f1 100644 --- a/components/altlogrotate/config-common.pan +++ b/components/altlogrotate/config-common.pan @@ -14,7 +14,7 @@ # # # - # altlogrotate, 13.9.0, 1, 20130911-1927 + # altlogrotate, 13.1.2, 1, 20131015-1106 # unique template components/altlogrotate/config-common; @@ -24,7 +24,7 @@ include { 'components/altlogrotate/schema' }; # Set prefix to root of component configuration. prefix '/software/components/altlogrotate'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/altlogrotate/config-rpm.pan b/components/altlogrotate/config-rpm.pan index b7199b6e4..392989347 100644 --- a/components/altlogrotate/config-rpm.pan +++ b/components/altlogrotate/config-rpm.pan @@ -19,8 +19,8 @@ unique template components/altlogrotate/config-rpm; include { 'components/altlogrotate/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-altlogrotate", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-altlogrotate", "13.1.2-1", "noarch"); '/software/components/altlogrotate/dependencies/pre' ?= list('spma'); -'/software/components/altlogrotate/version' = '13.9.0'; +'/software/components/altlogrotate/version' = '13.1.2'; diff --git a/components/altlogrotate/config-xml.pan b/components/altlogrotate/config-xml.pan index 225f9efb7..31d8e21f9 100644 --- a/components/altlogrotate/config-xml.pan +++ b/components/altlogrotate/config-xml.pan @@ -14,7 +14,7 @@ # # # - # altlogrotate, 13.9.0, 1, 20130911-1927 + # altlogrotate, 13.1.2, 1, 20131015-1106 # unique template components/altlogrotate/config-xml; diff --git a/components/altlogrotate/config.pan b/components/altlogrotate/config.pan index 93915892c..f0ada9697 100644 --- a/components/altlogrotate/config.pan +++ b/components/altlogrotate/config.pan @@ -14,7 +14,7 @@ # # # - # altlogrotate, 13.9.0, 1, 20130911-1927 + # altlogrotate, 13.1.2, 1, 20131015-1106 # unique template components/altlogrotate/config; diff --git a/components/amandaserver/config-common.pan b/components/amandaserver/config-common.pan index 662a0d2ad..0963df4a3 100644 --- a/components/amandaserver/config-common.pan +++ b/components/amandaserver/config-common.pan @@ -14,7 +14,7 @@ # # # - # amandaserver, 13.9.0, 1, 20130911-1927 + # amandaserver, 13.1.2, 1, 20131015-1106 # unique template components/amandaserver/config-common; @@ -24,7 +24,7 @@ include { 'components/amandaserver/schema' }; # Set prefix to root of component configuration. prefix '/software/components/amandaserver'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/amandaserver/config-rpm.pan b/components/amandaserver/config-rpm.pan index 6a728c3c9..cec99aa27 100644 --- a/components/amandaserver/config-rpm.pan +++ b/components/amandaserver/config-rpm.pan @@ -25,7 +25,7 @@ include {'components/amandaserver/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-amandaserver", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-amandaserver", "13.1.2-1", "noarch"); "/software/components/amandaserver/dependencies/pre" ?= list ("spma"); diff --git a/components/amandaserver/config-xml.pan b/components/amandaserver/config-xml.pan index 9d68eac1b..9310b6f84 100644 --- a/components/amandaserver/config-xml.pan +++ b/components/amandaserver/config-xml.pan @@ -14,7 +14,7 @@ # # # - # amandaserver, 13.9.0, 1, 20130911-1927 + # amandaserver, 13.1.2, 1, 20131015-1106 # unique template components/amandaserver/config-xml; diff --git a/components/amandaserver/config.pan b/components/amandaserver/config.pan index 282afa15c..3081d6833 100644 --- a/components/amandaserver/config.pan +++ b/components/amandaserver/config.pan @@ -14,7 +14,7 @@ # # # - # amandaserver, 13.9.0, 1, 20130911-1927 + # amandaserver, 13.1.2, 1, 20131015-1106 # unique template components/amandaserver/config; diff --git a/components/apel/config-common.pan b/components/apel/config-common.pan new file mode 100644 index 000000000..0dbb3b8ac --- /dev/null +++ b/components/apel/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # apel, 13.1.2, 1, 20131015-1127 + # + +unique template components/apel/config-common; + +include { 'components/apel/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/apel'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/apel/config-rpm.pan b/components/apel/config-rpm.pan new file mode 100644 index 000000000..82db547f5 --- /dev/null +++ b/components/apel/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # apel, 13.1.2, 1, 20131015-1127 + # + +unique template components/apel/config-rpm; + +include { 'components/apel/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/apel'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-apel','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/apel/config-xml.pan b/components/apel/config-xml.pan new file mode 100644 index 000000000..886685706 --- /dev/null +++ b/components/apel/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # apel, 13.1.2, 1, 20131015-1127 + # + +unique template components/apel/config-xml; + +include { 'components/apel/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/apel'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/apel/apel.pm'); diff --git a/components/apel/config.pan b/components/apel/config.pan new file mode 100644 index 000000000..df23714cf --- /dev/null +++ b/components/apel/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # apel, 13.1.2, 1, 20131015-1127 + # + +unique template components/apel/config; + +include { 'components/apel/config-rpm' }; diff --git a/components/apel/schema.pan b/components/apel/schema.pan new file mode 100644 index 000000000..4f7a0b5cd --- /dev/null +++ b/components/apel/schema.pan @@ -0,0 +1,96 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # apel, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/apel/schema; + +include { 'quattor/schema' }; +include { 'pan/types' }; + +type structure_apel_db_delete_processor = { + 'cleanAll' : string with match(SELF, 'yes|no') +}; + +type structure_apel_cpu_processor = { + 'GIIS' ? type_hostname + 'DefaultCPUSpec' ? string with match(SELF, '^\d+:\d+$') +}; + +type structure_apel_event_log_processor = { + 'searchSubDirs' ? string with match(SELF, 'yes|no') + 'reprocess' ? string with match(SELF, 'yes|no') + 'Dir' : string + 'ExtraFile' ? string[] + 'Timezone' ? string +}; + +type structure_apel_gk_log_processor = { + 'SubmitHost' : type_hostname + 'searchSubDirs' ? string with match(SELF, 'yes|no') + 'reprocess' ? string with match(SELF, 'yes|no') + 'GKLogs' : string[] + 'MessageLogs' : string[] +}; + +type structure_apel_blahd_log_processor = { + 'SubmitHost' : type_hostname + 'BlahdLogPrefix' : string + 'BlahdLogDir' : string[] + 'searchSubDirs' : string with match(SELF, 'yes|no') + 'reprocess' : string with match(SELF, 'yes|no') +}; + + +type structure_apel_join_processor = { + 'publishGlobalUserName' : string with match(SELF, 'yes|no') + 'Republish' : string with match(SELF, 'all|missing|nothing') +}; + +type structure_apel_file = { + 'enableDebugLogging' ? string with match(SELF, 'yes|no') + 'inspectTables' ? string with match(SELF, "yes|no") + 'DBURL' : string + 'DBUsername' : string + 'DBPassword' : string + # Do not enforce a default for publishLimit in schema as this + # option is not supported by old version of publisher + 'publishLimit' ? long + 'SiteName' : string + 'DBDeleteProcessor' ? structure_apel_db_delete_processor + 'CPUProcessor' ? structure_apel_cpu_processor + 'EventLogProcessor' ? structure_apel_event_log_processor + 'GKLogProcessor' ? structure_apel_gk_log_processor + 'JoinProcessor' ? structure_apel_join_processor + 'BlahdLogProcessor' ? structure_apel_blahd_log_processor + # do not enforce following options, they are not supported by previous versions + # BUT they are REQUIRED for newest versions, and will cause an unexplained apel crash + # if not present + 'MaxInsertBatch' ? long + #default value: 2000 + 'ConsumerTimeout' ? long + #default value 1800000 +}; + + +type apel_component = { + include structure_component + 'configFiles' ? structure_apel_file{} +}; + +bind '/software/components/apel' = apel_component; diff --git a/components/authconfig/config-common.pan b/components/authconfig/config-common.pan index f9db7edb1..3c5c023ab 100644 --- a/components/authconfig/config-common.pan +++ b/components/authconfig/config-common.pan @@ -14,7 +14,7 @@ # # # - # authconfig, 13.9.0, 1, 20130911-1927 + # authconfig, 13.1.2, 1, 20131015-1106 # unique template components/authconfig/config-common; @@ -24,7 +24,7 @@ include { 'components/authconfig/schema' }; # Set prefix to root of component configuration. prefix '/software/components/authconfig'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/authconfig/config-rpm.pan b/components/authconfig/config-rpm.pan index 659145b8b..c49db9af8 100644 --- a/components/authconfig/config-rpm.pan +++ b/components/authconfig/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/authconfig/config-rpm; include { 'components/authconfig/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-authconfig", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-authconfig", "13.1.2-1", "noarch"); "/software/components/authconfig/dependencies/pre" ?= list("spma"); diff --git a/components/authconfig/config-xml.pan b/components/authconfig/config-xml.pan index 06efaed07..5e9565693 100644 --- a/components/authconfig/config-xml.pan +++ b/components/authconfig/config-xml.pan @@ -14,7 +14,7 @@ # # # - # authconfig, 13.9.0, 1, 20130911-1927 + # authconfig, 13.1.2, 1, 20131015-1106 # unique template components/authconfig/config-xml; diff --git a/components/authconfig/config.pan b/components/authconfig/config.pan index 9fb1264b0..8a537d5eb 100644 --- a/components/authconfig/config.pan +++ b/components/authconfig/config.pan @@ -14,7 +14,7 @@ # # # - # authconfig, 13.9.0, 1, 20130911-1927 + # authconfig, 13.1.2, 1, 20131015-1106 # unique template components/authconfig/config; diff --git a/components/autofs/config-common.pan b/components/autofs/config-common.pan index 173d0b08c..9f578c8b0 100644 --- a/components/autofs/config-common.pan +++ b/components/autofs/config-common.pan @@ -14,7 +14,7 @@ # # # - # autofs, 13.9.0, 1, 20130911-1927 + # autofs, 13.1.2, 1, 20131015-1106 # unique template components/autofs/config-common; @@ -24,7 +24,7 @@ include { 'components/autofs/schema' }; # Set prefix to root of component configuration. prefix '/software/components/autofs'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/autofs/config-rpm.pan b/components/autofs/config-rpm.pan index 45750fd53..7dd46e842 100644 --- a/components/autofs/config-rpm.pan +++ b/components/autofs/config-rpm.pan @@ -26,10 +26,10 @@ unique template components/autofs/config-rpm; include { 'components/autofs/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-autofs", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-autofs", "13.1.2-1", "noarch"); -'/software/components/autofs/version' = '13.9.0'; +'/software/components/autofs/version' = '13.1.2'; "/software/components/autofs/dependencies/pre" ?= list("spma"); "/software/components/autofs/active" ?= true; diff --git a/components/autofs/config-xml.pan b/components/autofs/config-xml.pan index b7b833a28..287d79982 100644 --- a/components/autofs/config-xml.pan +++ b/components/autofs/config-xml.pan @@ -14,7 +14,7 @@ # # # - # autofs, 13.9.0, 1, 20130911-1927 + # autofs, 13.1.2, 1, 20131015-1106 # unique template components/autofs/config-xml; diff --git a/components/autofs/config.pan b/components/autofs/config.pan index 43c9d342c..bbaa0720e 100644 --- a/components/autofs/config.pan +++ b/components/autofs/config.pan @@ -14,7 +14,7 @@ # # # - # autofs, 13.9.0, 1, 20130911-1927 + # autofs, 13.1.2, 1, 20131015-1106 # unique template components/autofs/config; diff --git a/components/ccm/config-common.pan b/components/ccm/config-common.pan index 777eb91c2..57cc187a4 100644 --- a/components/ccm/config-common.pan +++ b/components/ccm/config-common.pan @@ -11,7 +11,7 @@ # # # - # ccm, 13.9.0, 1, 20130911-1927 + # ccm, 13.1.2, 1, 20131015-1106 # unique template components/ccm/config-common; @@ -21,7 +21,7 @@ include { 'components/ccm/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ccm'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ccm/config-rpm.pan b/components/ccm/config-rpm.pan index 51367fb63..e63b8f1f4 100644 --- a/components/ccm/config-rpm.pan +++ b/components/ccm/config-rpm.pan @@ -16,9 +16,9 @@ unique template components/ccm/config-rpm; include {'components/ccm/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-ccm", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ccm", "13.1.2-1", "noarch"); '/software/components/ccm/dependencies/pre' ?= list('spma'); -'/software/components/ccm/version' ?= '13.9.0'; +'/software/components/ccm/version' ?= '13.1.2'; diff --git a/components/ccm/config-xml.pan b/components/ccm/config-xml.pan index 5806d5d7b..b5b457d92 100644 --- a/components/ccm/config-xml.pan +++ b/components/ccm/config-xml.pan @@ -11,7 +11,7 @@ # # # - # ccm, 13.9.0, 1, 20130911-1927 + # ccm, 13.1.2, 1, 20131015-1106 # unique template components/ccm/config-xml; diff --git a/components/ccm/config.pan b/components/ccm/config.pan index 7d244954b..97d6b530d 100644 --- a/components/ccm/config.pan +++ b/components/ccm/config.pan @@ -11,7 +11,7 @@ # # # - # ccm, 13.9.0, 1, 20130911-1927 + # ccm, 13.1.2, 1, 20131015-1106 # unique template components/ccm/config; diff --git a/components/cdp/config-common.pan b/components/cdp/config-common.pan index a0817c891..e92a09fbd 100644 --- a/components/cdp/config-common.pan +++ b/components/cdp/config-common.pan @@ -14,7 +14,7 @@ # # # - # cdp, 13.9.0, 1, 20130911-1927 + # cdp, 13.1.2, 1, 20131015-1106 # unique template components/cdp/config-common; @@ -24,7 +24,7 @@ include { 'components/cdp/schema' }; # Set prefix to root of component configuration. prefix '/software/components/cdp'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/cdp/config-rpm.pan b/components/cdp/config-rpm.pan index 2bf61ce8e..05253f94a 100644 --- a/components/cdp/config-rpm.pan +++ b/components/cdp/config-rpm.pan @@ -19,9 +19,9 @@ unique template components/cdp/config-rpm; include { 'components/cdp/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-cdp", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-cdp", "13.1.2-1", "noarch"); '/software/components/cdp/dependencies/pre' ?= list('spma'); -'/software/components/cdp/version' = '13.9.0'; +'/software/components/cdp/version' = '13.1.2'; diff --git a/components/cdp/config-xml.pan b/components/cdp/config-xml.pan index 277762b0d..8158bce32 100644 --- a/components/cdp/config-xml.pan +++ b/components/cdp/config-xml.pan @@ -14,7 +14,7 @@ # # # - # cdp, 13.9.0, 1, 20130911-1927 + # cdp, 13.1.2, 1, 20131015-1106 # unique template components/cdp/config-xml; diff --git a/components/cdp/config.pan b/components/cdp/config.pan index 2811f0494..0eb0b4701 100644 --- a/components/cdp/config.pan +++ b/components/cdp/config.pan @@ -14,7 +14,7 @@ # # # - # cdp, 13.9.0, 1, 20130911-1927 + # cdp, 13.1.2, 1, 20131015-1106 # unique template components/cdp/config; diff --git a/components/chkconfig/config-common.pan b/components/chkconfig/config-common.pan index d51b0b535..e391efc61 100644 --- a/components/chkconfig/config-common.pan +++ b/components/chkconfig/config-common.pan @@ -14,7 +14,7 @@ # # # - # chkconfig, 13.9.0, 1, 20130911-1927 + # chkconfig, 13.1.2, 1, 20131015-1106 # unique template components/chkconfig/config-common; @@ -24,7 +24,7 @@ include { 'components/chkconfig/schema' }; # Set prefix to root of component configuration. prefix '/software/components/chkconfig'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/chkconfig/config-rpm.pan b/components/chkconfig/config-rpm.pan index f475cbdf0..382ad6a2b 100644 --- a/components/chkconfig/config-rpm.pan +++ b/components/chkconfig/config-rpm.pan @@ -26,7 +26,7 @@ unique template components/chkconfig/config-rpm; include { 'components/chkconfig/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-chkconfig", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-chkconfig", "13.1.2-1", "noarch"); "/software/components/chkconfig/dependencies/pre" ?= list("spma"); diff --git a/components/chkconfig/config-xml.pan b/components/chkconfig/config-xml.pan index cce45a945..cc4fed4aa 100644 --- a/components/chkconfig/config-xml.pan +++ b/components/chkconfig/config-xml.pan @@ -14,7 +14,7 @@ # # # - # chkconfig, 13.9.0, 1, 20130911-1927 + # chkconfig, 13.1.2, 1, 20131015-1106 # unique template components/chkconfig/config-xml; diff --git a/components/chkconfig/config.pan b/components/chkconfig/config.pan index f48513752..895f2805e 100644 --- a/components/chkconfig/config.pan +++ b/components/chkconfig/config.pan @@ -14,7 +14,7 @@ # # # - # chkconfig, 13.9.0, 1, 20130911-1927 + # chkconfig, 13.1.2, 1, 20131015-1106 # unique template components/chkconfig/config; diff --git a/components/condorconfig/config-common.pan b/components/condorconfig/config-common.pan new file mode 100644 index 000000000..a5795634c --- /dev/null +++ b/components/condorconfig/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # condorconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/condorconfig/config-common; + +include { 'components/condorconfig/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/condorconfig'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/condorconfig/config-rpm.pan b/components/condorconfig/config-rpm.pan new file mode 100644 index 000000000..1a112584f --- /dev/null +++ b/components/condorconfig/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # condorconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/condorconfig/config-rpm; + +include { 'components/condorconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/condorconfig'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-condorconfig','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/condorconfig/config-xml.pan b/components/condorconfig/config-xml.pan new file mode 100644 index 000000000..d7d73ce82 --- /dev/null +++ b/components/condorconfig/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # condorconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/condorconfig/config-xml; + +include { 'components/condorconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/condorconfig'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/condorconfig/condorconfig.pm'); diff --git a/components/condorconfig/config.pan b/components/condorconfig/config.pan new file mode 100644 index 000000000..01cbf146b --- /dev/null +++ b/components/condorconfig/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # condorconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/condorconfig/config; + +include { 'components/condorconfig/config-rpm' }; diff --git a/components/condorconfig/schema.pan b/components/condorconfig/schema.pan new file mode 100644 index 000000000..87a0e3f32 --- /dev/null +++ b/components/condorconfig/schema.pan @@ -0,0 +1,193 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # condorconfig, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/condorconfig/schema; + +include { 'quattor/schema' }; + +type condorconfig_component = { + include structure_component + 'configFile' : string = '/opt/condor-c/etc/condor_config' + 'localConfigFile' : string = '/opt/condor-c/local.localhost/condor_config.local' + 'user' : string = 'glite' + 'RELEASE_DIR' ? string + 'LOCAL_DIR' ? string + 'CONDOR_ADMIN' ? string + 'MAIL' ? string + 'CONDOR_HOST' ? string + 'UID_DOMAIN' ? string + 'FILESYSTEM_DOMAIN' ? string + 'COLLECTOR_NAME' ? string + 'USERNAME' ? string + 'LOCK' ? string + 'FLOCK_FROM' ? string + 'FLOCK_TO' ? string + 'FLOCK_NEGOTIATOR_HOSTS' ? string + 'FLOCK_COLLECTOR_HOSTS' ? string + 'ALLOW_ADMINISTRATOR' ? string + 'ALLOW_OWNER' ? string + 'ALLOW_READ' ? string + 'ALLOW_WRITE' ? string + 'ALLOW_NEGOTIATOR' ? string + 'ALLOW_NEGOTIATOR_SCHEDD' ? string + 'ALLOW_WRITE_COLLECTOR' ? string + 'ALLOW_WRITE_STARTD' ? string + 'ALLOW_READ_COLLECTOR' ? string + 'ALLOW_READ_STARTD' ? string + 'GLIDEIN_SITES' ? string + 'NEGOTIATOR_IGNORE_USER_PRIORITIES' ? string + 'CONDOR_IDS' ? string + 'MAX_COLLECTOR_LOG' ? string + 'COLLECTOR_DEBUG' ? string + 'MAX_NEGOTIATOR_LOG' ? string + 'NEGOTIATOR_DEBUG' ? string + 'MAX_NEGOTIATOR_MATCH_LOG' ? string + 'MAX_SCHEDD_LOG' ? string + 'SCHEDD_DEBUG' ? string + 'MAX_SHADOW_LOG' ? string + 'SHADOW_DEBUG' ? string + 'MAX_STARTD_LOG' ? string + 'STARTD_DEBUG' ? string + 'MINUTE' ? string + 'HOUR' ? string + 'StateTimer' ? string + 'ActivityTimer' ? string + 'ActivationTimer' ? string + 'LastCkpt' ? string + 'STANDARD' ? string + 'VANILLA' ? string + 'IsVanilla' ? string + 'IsStandard' ? string + 'NonCondorLoadAvg' ? string + 'BackgroundLoad' ? string + 'HighLoad' ? string + 'StartIdleTime' ? string + 'ContinueIdleTime' ? string + 'MaxSuspendTime' ? string + 'MaxVacateTime' ? string + 'KeyboardBusy' ? string + 'ConsoleBusy' ? string + 'CPUIdle' ? string + 'CPUBusy' ? string + 'BigJob' ? string + 'MediumJob' ? string + 'SmallJob' ? string + 'JustCPU' ? string + 'MachineBusy' ? string + 'WANT_SUSPEND' ? string + 'WANT_VACATE' ? string + 'START' ? string + 'SUSPEND' ? string + 'CONTINUE' ? string + 'PREEMPT' ? string + 'KILL' ? string + 'LOG' ? string + 'SPOOL' ? string + 'EXECUTE' ? string + 'BIN' ? string + 'LIB' ? string + 'SBIN' ? string + 'HISTORY' ? string + 'COLLECTOR_LOG' ? string + 'MASTER_LOG' ? string + 'NEGOTIATOR_LOG' ? string + 'NEGOTIATOR_MATCH_LOG' ? string + 'SCHEDD_LOG' ? string + 'SHADOW_LOG' ? string + 'STARTD_LOG' ? string + 'SHADOW_LOCK' ? string + 'COLLECTOR_HOST' ? string + 'RESERVED_DISK' ? string + 'HIGHPORT' ? string + 'LOWPORT' ? string + 'DAEMON_LIST' ? string + 'MASTER' ? string + 'STARTD' ? string + 'SCHEDD' ? string + 'NEGOTIATOR' ? string + 'COLLECTOR' ? string + 'MASTER_ADDRESS_FILE' ? string + 'PREEN' ? string + 'PREEN_ARGS' ? string + 'MASTER_UPDATE_INTERVAL' ? string + 'STARTER_LIST' ? string + 'STARTER' ? string + 'STARTER_STANDARD' ? string + 'STARTER_LOCAL' ? string + 'STARTD_ADDRESS_FILE' ? string + 'UPDATE_INTERVAL' ? string + 'STARTD_JOB_EXPRS' ? string + 'SHADOW' ? string + 'SCHEDD_ADDRESS_FILE' ? string + 'SCHEDD_INTERVAL' ? string + 'SHADOW_SIZE_ESTIMATE' ? string + 'SHADOW_RENICE_INCREMENT' ? string + 'QUEUE_SUPER_USERS' ? string + 'VALID_SPOOL_FILES' ? string + 'INVALID_LOG_FILES' ? string + 'JAVA_MAXHEAP_ARGUMENT' ? string + 'GRIDMANAGER' ? string + 'GT2_GAHP' ? string + 'GRID_MONITOR' ? string + 'GRIDMANAGER_DEBUG' ? string + 'GRIDMANAGER_LOG' ? string + 'MAX_GRIDMANAGER_LOG' ? string + 'GRIDSHELL' ? string + 'GRIDMANAGER_MAX_JOBMANAGERS_PER_RESOURCE' ? string + 'GRIDMANAGER_CHECKPROXY_INTERVAL' ? string + 'GRIDMANAGER_MINIMUM_PROXY_TIME' ? string + 'DEFAULT_UNIVERSE' ? string + 'CRED_MIN_TIME_LEFT' ? string + 'ENABLE_GRID_MONITOR' ? string + 'CONDOR_GAHP' ? string + 'MAX_C_GAHP_LOG' ? string + 'C_GAHP_LOG' ? string + 'C_GAHP_WORKER_THREAD_LOG' ? string + 'NORDUGRID_GAHP' ? string + 'C_GAHP_TIMEOUT_MULTIPLIER' ? string + 'C_GAHP_WORKER_THREAD_TIMEOUT_MULTIPLIER' ? string + 'CLASSAD_LIFETIME' ? string + 'CONDOR_JOB_POLL_INTERVAL' ? string + 'COLLECTOR_TIMEOUT_MULTIPLIER' ? string + 'DAGMAN_ALLOW_EVENTS' ? string + 'GLITE_CONDORC_DEBUG_LEVEL' ? string + 'GLITE_CONDORC_LOG_DIR' ? string + 'GLOBUS_GATEKEEPER_TIMEOUT' ? string + 'GRID_MONITOR_HEARTBEAT_TIMEOUT' ? string + 'GRID_MONITOR_RETRY_DURATION' ? string + 'GRIDMANAGER_GLOBUS_COMMIT_TIMEOUT' ? string + 'GRIDMANAGER_MAX_PENDING_SUBMITS_PER_RESOURCE' ? string + 'GRIDMANAGER_MAX_SUBMITTED_JOBS_PER_RESOURCE' ? string + 'GRIDMANAGER_TIMEOUT_MULTIPLIER' ? string + 'GSI_DAEMON_CERT' ? string + 'GSI_DAEMON_KEY' ? string + 'HOLD_JOB_IF_CREDENTIAL_EXPIRES' ? string + 'HOSTALLOW_WRITE' ? string + 'NEGOTIATOR_INTERVAL' ? string + 'NEGOTIATOR_MATCHLIST_CACHING' ? string + 'NEGOTIATOR_UPDATE_INTERVAL' ? string + 'SEC_DEFAULT_NEGOTIATION' ? string + 'SEC_DEFAULT_AUTHENTICATION' ? string + 'SEC_DEFAULT_AUTHENTICATION_METHODS' ? string + 'SCHEDD_TIMEOUT_MULTIPLIER' ? string + 'TOOL_TIMEOUT_MULTIPLIER' ? string +}; + +bind '/software/components/condorconfig' = condorconfig_component; diff --git a/components/cron/config-common.pan b/components/cron/config-common.pan index 98417a7cd..c9a3be7c7 100644 --- a/components/cron/config-common.pan +++ b/components/cron/config-common.pan @@ -14,7 +14,7 @@ # # # - # cron, 13.9.0, 1, 20130911-1927 + # cron, 13.1.2, 1, 20131015-1106 # unique template components/cron/config-common; @@ -24,7 +24,7 @@ include { 'components/cron/schema' }; # Set prefix to root of component configuration. prefix '/software/components/cron'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/cron/config-rpm.pan b/components/cron/config-rpm.pan index 8f44ae549..514c67f3f 100644 --- a/components/cron/config-rpm.pan +++ b/components/cron/config-rpm.pan @@ -19,8 +19,8 @@ unique template components/cron/config-rpm; include { 'components/cron/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-cron", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-cron", "13.1.2-1", "noarch"); '/software/components/cron/dependencies/pre' ?= list('spma'); -'/software/components/cron/version' = '13.9.0'; +'/software/components/cron/version' = '13.1.2'; diff --git a/components/cron/config-xml.pan b/components/cron/config-xml.pan index 36520dece..718190d13 100644 --- a/components/cron/config-xml.pan +++ b/components/cron/config-xml.pan @@ -14,7 +14,7 @@ # # # - # cron, 13.9.0, 1, 20130911-1927 + # cron, 13.1.2, 1, 20131015-1106 # unique template components/cron/config-xml; diff --git a/components/cron/config.pan b/components/cron/config.pan index 156131a80..304baf116 100644 --- a/components/cron/config.pan +++ b/components/cron/config.pan @@ -14,7 +14,7 @@ # # # - # cron, 13.9.0, 1, 20130911-1927 + # cron, 13.1.2, 1, 20131015-1106 # unique template components/cron/config; diff --git a/components/cups/config-common.pan b/components/cups/config-common.pan index 41f0da034..a874b74a7 100644 --- a/components/cups/config-common.pan +++ b/components/cups/config-common.pan @@ -11,7 +11,7 @@ # # # - # cups, 13.9.0, 1, 20130911-1927 + # cups, 13.1.2, 1, 20131015-1106 # unique template components/cups/config-common; @@ -21,7 +21,7 @@ include { 'components/cups/schema' }; # Set prefix to root of component configuration. prefix '/software/components/cups'; -'version' = '13.9.0'; +'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/cups/config-rpm.pan b/components/cups/config-rpm.pan index d81272f24..ea758fe90 100644 --- a/components/cups/config-rpm.pan +++ b/components/cups/config-rpm.pan @@ -11,7 +11,7 @@ # # # - # cups, 13.9.0, 1, 20130911-1927 + # cups, 13.1.2, 1, 20131015-1106 # unique template components/cups/config-rpm; @@ -22,6 +22,6 @@ include { 'components/cups/config-common' }; prefix '/software/components/cups'; # Install Quattor configuration module via RPM package. -'/software/packages' = pkg_repl('ncm-cups','13.9.0-1','noarch'); +'/software/packages' = pkg_repl('ncm-cups','13.1.2-1','noarch'); 'dependencies/pre' ?= list('spma'); diff --git a/components/cups/config-xml.pan b/components/cups/config-xml.pan index ccc28972d..85448ebec 100644 --- a/components/cups/config-xml.pan +++ b/components/cups/config-xml.pan @@ -11,7 +11,7 @@ # # # - # cups, 13.9.0, 1, 20130911-1927 + # cups, 13.1.2, 1, 20131015-1106 # unique template components/cups/config-xml; diff --git a/components/dcache/config-common.pan b/components/dcache/config-common.pan new file mode 100644 index 000000000..82dd6b42c --- /dev/null +++ b/components/dcache/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn.De.Weirdt@cern.ch +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dcache, 13.1.2, 1, 20131015-1127 + # + +unique template components/dcache/config-common; + +include { 'components/dcache/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dcache'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/dcache/config-rpm.pan b/components/dcache/config-rpm.pan new file mode 100644 index 000000000..70e3b42a1 --- /dev/null +++ b/components/dcache/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn.De.Weirdt@cern.ch +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dcache, 13.1.2, 1, 20131015-1127 + # + +unique template components/dcache/config-rpm; + +include { 'components/dcache/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dcache'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-dcache','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/dcache/config-xml.pan b/components/dcache/config-xml.pan new file mode 100644 index 000000000..e70d6994a --- /dev/null +++ b/components/dcache/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn.De.Weirdt@cern.ch +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dcache, 13.1.2, 1, 20131015-1127 + # + +unique template components/dcache/config-xml; + +include { 'components/dcache/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dcache'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/dcache/dcache.pm'); diff --git a/components/dcache/config.pan b/components/dcache/config.pan new file mode 100644 index 000000000..c452b8f73 --- /dev/null +++ b/components/dcache/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn.De.Weirdt@cern.ch +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dcache, 13.1.2, 1, 20131015-1127 + # + +unique template components/dcache/config; + +include { 'components/dcache/config-rpm' }; diff --git a/components/dcache/schema.pan b/components/dcache/schema.pan new file mode 100644 index 000000000..226693193 --- /dev/null +++ b/components/dcache/schema.pan @@ -0,0 +1,243 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn.De.Weirdt@cern.ch +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dcache, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/dcache/schema; + +include { 'quattor/schema' }; + +type structure_dcache_unit_units = { + "cond" : string + "ugroup" : string[] +}; + +type structure_dcache_unit = { + "units" : structure_dcache_unit_units[]{} + "ignore_ugroup" ? string[] +}; + +type structure_dcache_link_preference = { + "read" ? long with (self>=0) + "write" ? long with (self>=0) + "cache" ? long with (self>=0) + "p2p" ? long with (self>=0) +}; + +type structure_dcache_link_default_preference = { + include structure_dcache_link_preference + "default" ? long with (self>=0) +}; + +type structure_dcache_link_policy = { + "nearline" ? boolean + "online" ? boolean + "custodial" ? boolean + "output" ? boolean + "replica" ? boolean +}; + +type structure_dcache_link_default_policy = { + include structure_dcache_link_policy + "default" ? boolean +}; + +type structure_dcache_link_linkgroups = { + include structure_dcache_link_policy + "links" ? string[] +}; + +type structure_dcache_link_links = { + include structure_dcache_link_preference + "ugroup" : string[] + "pgroup" : string[] + "lgroup" ? string +}; + +type structure_dcache_link = { + "links" : structure_dcache_link_links{} + "ignore_link" ? string[] + "def_preference" ? structure_dcache_link_default_preference + "def_policy" ? structure_dcache_link_default_policy + "ignore_linkgroup" ? string[] + "linkgroups" ? structure_dcache_link_linkgroups{} +}; + +type structure_dcache_pool_pools = { + "path" : string + "size" ? long with (self>=0) + "opt" ? string + "pgroup" ? string[] + "mover_max" ? long with (self>=0) + "ulimit_n" ? long with (self>=0) +}; + + +type structure_dcache_pool = { + "pools" ? structure_dcache_pool_pools[]{} + "ignore_pgroup" ? string[] + "default_mover_max" ? long with (self>=0) + "default_ulimit_n" ? long with (self>=0) + "max_true_pool_size_prom" ? long with (self>=0) +}; + +type structure_dcache_dcachesetup = { + "serviceLocatorHost" : type_fqdn + "cacheInfo" ? string + "java" ? string + "pnfs" ? string + "ftpBase" ? string + "portBase" ? long with (self>=0) + "logArea" ? string + "parallelStreams" ? long with (self>=0) + "bufferSize" ? long with (self>=0) + "tcpBufferSize" ? long with (self>=0) + "billingToDb" ? string + "infoProviderStaticFile" ? string + "metaDataRepository" ? string + "metaDataRepositoryImport" ? string + "PermissionHandlerDataSource" ? string +}; + +type structure_dcache_node_config = { + "node_type" : string + # dcache_base_dir is deprecated for dcache_home + #"dcache_base_dir" ? string + + "dcache_home" ? string + + "pnfs_root" ? string + "pnfs_install_dir" ? string + "pnfs_start" ? boolean + "pnfs_overwrite" ? boolean + + "pool_path" ? string + "number_of_movers" ? long with (self>=0) + "server_id" ? string + "admin_node" ? type_fqdn + + "gsidcap" ? boolean + "gridftp" ? boolean + "srm" ? boolean + "xrootd" ? boolean + "dcap" ? boolean + "replicaManager" ? boolean + "pnfsManager" ? boolean + "lmDomain" ? boolean + "httpDomain" ? boolean + "adminDoor" ? boolean + "poolManager" ? boolean + "utilityDomain" ? boolean + "dirDomain" ? boolean + "gPlazmaService" ? boolean + "infoProvider" ? boolean + + "namespace" ? string + "namespace_node" ? string +}; + +type structure_dcache_pnfs_setup = { + "shmservers" ? long with (self>=0) +}; + +type structure_dcache_pnfs_config = { + "pnfs_install_dir" ? string + "pnfs_root" ? string + "pnfs_db" ? string + "pnfs_log" ? string + "pnfs_overwrite" ? boolean + "pnfs_psql_user" ? string +}; + +type structure_dcache_pnfs_db = { + "path" : string + "name" : string + "user" ? string + "group" ? string + "perm" ? string +}; + +type structure_dcache_pnfs_exports_rule = { + "mount" : string + "path" : string + "perm" : string + "opt" ? string +}; + +type structure_dcache_pnfs_exports = { + "ip" : type_ip + "netmask" ? type_ip + "rule" : structure_dcache_pnfs_exports_rule[] +}; + +type structure_dcache_pnfs = { + "pnfs_config" ? structure_dcache_pnfs_config + "pnfs_config_def" ? string[] + "databases" ? structure_dcache_pnfs_db[] + "exports" : structure_dcache_pnfs_exports[] + "pnfs_setup" ? structure_dcache_pnfs_setup + "pnfs_setup_def" ? string[] +}; + +type structure_dcache_create = { + 'batchname' : string + 'name' : string + 'cell' : string + 'context' ? string{} + 'opt' ? string{} +}; + +type structure_dcache_batch = { + 'create' : structure_dcache_create[] + 'batch_read' ? string + 'batch_write' ? string + 'batch_template' ? boolean +}; + +type structure_dcache_config = { + "dc_dir" ? string + "node_config_def" ? string[] + "node_config" : structure_dcache_node_config + "dCacheSetup_def" ? string[] + "dCacheSetup" : structure_dcache_dcachesetup + "admin_passwd" ? string + "debug_print" ? long with (self>0) + "jythonjavahome" : string +}; + +type structure_dcache_chimera = { + "paths" ? string[] + "exports" ? string[] + "default_dcap" ? string +}; + +type dcache_component = { + include structure_component + include structure_component_dependency + "pool" ? structure_dcache_pool + "config": structure_dcache_config + "pnfs" ? structure_dcache_pnfs + "chimera" ? structure_dcache_chimera + "unit" ? structure_dcache_unit + "link" ? structure_dcache_link + "batch" ? structure_dcache_batch + "postgresql" ? string +}; + +bind '/software/components/dcache' = dcache_component; + diff --git a/components/directoryservices/config-common.pan b/components/directoryservices/config-common.pan index 61f48a9ac..73e3f373a 100644 --- a/components/directoryservices/config-common.pan +++ b/components/directoryservices/config-common.pan @@ -14,7 +14,7 @@ # # # - # directoryservices, 13.9.0, 1, 20130911-1927 + # directoryservices, 13.1.2, 1, 20131015-1106 # unique template components/directoryservices/config-common; @@ -24,7 +24,7 @@ include { 'components/directoryservices/schema' }; # Set prefix to root of component configuration. prefix '/software/components/directoryservices'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/directoryservices/config-rpm.pan b/components/directoryservices/config-rpm.pan index 52831f35d..d8f178ae4 100644 --- a/components/directoryservices/config-rpm.pan +++ b/components/directoryservices/config-rpm.pan @@ -27,7 +27,7 @@ unique template components/directoryservices/config-rpm; include { 'components/directoryservices/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-directoryservices", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-directoryservices", "13.1.2-1", "noarch"); "/software/components/directoryservices/dependencies/pre" ?= list("directoryservices"); diff --git a/components/directoryservices/config-xml.pan b/components/directoryservices/config-xml.pan index 9731f8ec9..476fd0f0e 100644 --- a/components/directoryservices/config-xml.pan +++ b/components/directoryservices/config-xml.pan @@ -14,7 +14,7 @@ # # # - # directoryservices, 13.9.0, 1, 20130911-1927 + # directoryservices, 13.1.2, 1, 20131015-1106 # unique template components/directoryservices/config-xml; diff --git a/components/directoryservices/config.pan b/components/directoryservices/config.pan index 82ae8c08a..b46ed9487 100644 --- a/components/directoryservices/config.pan +++ b/components/directoryservices/config.pan @@ -14,7 +14,7 @@ # # # - # directoryservices, 13.9.0, 1, 20130911-1927 + # directoryservices, 13.1.2, 1, 20131015-1106 # unique template components/directoryservices/config; diff --git a/components/dirperm/config-common.pan b/components/dirperm/config-common.pan index 961b8594e..f43ed60c3 100644 --- a/components/dirperm/config-common.pan +++ b/components/dirperm/config-common.pan @@ -14,7 +14,7 @@ # # # - # dirperm, 13.9.0, 1, 20130911-1927 + # dirperm, 13.1.2, 1, 20131015-1106 # unique template components/dirperm/config-common; @@ -24,7 +24,7 @@ include { 'components/dirperm/schema' }; # Set prefix to root of component configuration. prefix '/software/components/dirperm'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/dirperm/config-rpm.pan b/components/dirperm/config-rpm.pan index 277ecbbf5..6642676c1 100644 --- a/components/dirperm/config-rpm.pan +++ b/components/dirperm/config-rpm.pan @@ -19,9 +19,9 @@ unique template components/dirperm/config-rpm; include { "components/dirperm/schema" }; # Package to install -"/software/packages" = pkg_repl("ncm-dirperm", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-dirperm", "13.1.2-1", "noarch"); '/software/components/dirperm/dependencies/pre' ?= list('spma'); -'/software/components/dirperm/version' = '13.9.0'; +'/software/components/dirperm/version' = '13.1.2'; diff --git a/components/dirperm/config-xml.pan b/components/dirperm/config-xml.pan index 0bd8903e0..304f9c708 100644 --- a/components/dirperm/config-xml.pan +++ b/components/dirperm/config-xml.pan @@ -14,7 +14,7 @@ # # # - # dirperm, 13.9.0, 1, 20130911-1927 + # dirperm, 13.1.2, 1, 20131015-1106 # unique template components/dirperm/config-xml; diff --git a/components/dirperm/config.pan b/components/dirperm/config.pan index f64273b54..01999db4b 100644 --- a/components/dirperm/config.pan +++ b/components/dirperm/config.pan @@ -14,7 +14,7 @@ # # # - # dirperm, 13.9.0, 1, 20130911-1927 + # dirperm, 13.1.2, 1, 20131015-1106 # unique template components/dirperm/config; diff --git a/components/diskless_server/config-common.pan b/components/diskless_server/config-common.pan index 03e2060b7..b6e64b272 100644 --- a/components/diskless_server/config-common.pan +++ b/components/diskless_server/config-common.pan @@ -14,7 +14,7 @@ # # # - # diskless_server, 13.9.0, 1, 20130911-1927 + # diskless_server, 13.1.2, 1, 20131015-1106 # unique template components/diskless_server/config-common; @@ -24,7 +24,7 @@ include { 'components/diskless_server/schema' }; # Set prefix to root of component configuration. prefix '/software/components/diskless_server'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/diskless_server/config-rpm.pan b/components/diskless_server/config-rpm.pan index 65dea681b..77c16f9ba 100644 --- a/components/diskless_server/config-rpm.pan +++ b/components/diskless_server/config-rpm.pan @@ -23,5 +23,5 @@ include {'components/diskless_server/schema'}; #"/software/components/diskless_server/dependencies/pre" = list("spma"); "/software/components/diskless_server/active" = true; "/software/components/diskless_server/dispatch" ?= true; -"/software/packages" = pkg_repl("diskless_server", "13.9.0-13.9.0", "noarch"); -"/software/packages" = pkg_repl("ncm-diskless_server", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("diskless_server", "13.1.2-13.1.2", "noarch"); +"/software/packages" = pkg_repl("ncm-diskless_server", "13.1.2-1", "noarch"); diff --git a/components/diskless_server/config-xml.pan b/components/diskless_server/config-xml.pan index f3dc7d145..a6456014b 100644 --- a/components/diskless_server/config-xml.pan +++ b/components/diskless_server/config-xml.pan @@ -14,7 +14,7 @@ # # # - # diskless_server, 13.9.0, 1, 20130911-1927 + # diskless_server, 13.1.2, 1, 20131015-1106 # unique template components/diskless_server/config-xml; diff --git a/components/diskless_server/config.pan b/components/diskless_server/config.pan index 2ddf42a12..6916f91f6 100644 --- a/components/diskless_server/config.pan +++ b/components/diskless_server/config.pan @@ -14,7 +14,7 @@ # # # - # diskless_server, 13.9.0, 1, 20130911-1927 + # diskless_server, 13.1.2, 1, 20131015-1106 # unique template components/diskless_server/config; diff --git a/components/download/config-common.pan b/components/download/config-common.pan index 2a0af1b95..7b71d4f30 100644 --- a/components/download/config-common.pan +++ b/components/download/config-common.pan @@ -11,7 +11,7 @@ # # # - # download, 13.9.0, 1, 20130911-1927 + # download, 13.1.2, 1, 20131015-1106 # unique template components/download/config-common; @@ -21,7 +21,7 @@ include { 'components/download/schema' }; # Set prefix to root of component configuration. prefix '/software/components/download'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/download/config-rpm.pan b/components/download/config-rpm.pan index 28a148d1d..e0735be92 100644 --- a/components/download/config-rpm.pan +++ b/components/download/config-rpm.pan @@ -46,8 +46,8 @@ include { "pan/functions" }; # standard component settings "/software/components/download/active" ?= true ; "/software/components/download/dispatch" ?= false ; -"/software/components/download/version" = '13.9.0'; +"/software/components/download/version" = '13.1.2'; "/software/components/download/release" = "1"; -"/software/packages" = pkg_repl("ncm-download", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-download", "13.1.2-1", "noarch"); diff --git a/components/download/config-xml.pan b/components/download/config-xml.pan index 6000993ef..55eccd66b 100644 --- a/components/download/config-xml.pan +++ b/components/download/config-xml.pan @@ -11,7 +11,7 @@ # # # - # download, 13.9.0, 1, 20130911-1927 + # download, 13.1.2, 1, 20131015-1106 # unique template components/download/config-xml; diff --git a/components/download/config.pan b/components/download/config.pan index cb5230763..845f4f0d0 100644 --- a/components/download/config.pan +++ b/components/download/config.pan @@ -11,7 +11,7 @@ # # # - # download, 13.9.0, 1, 20130911-1927 + # download, 13.1.2, 1, 20131015-1106 # unique template components/download/config; diff --git a/components/dpmlfc/config-common.pan b/components/dpmlfc/config-common.pan new file mode 100644 index 000000000..4a38db2dc --- /dev/null +++ b/components/dpmlfc/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dpmlfc, 13.1.2, 1, 20131015-1127 + # + +unique template components/dpmlfc/config-common; + +include { 'components/dpmlfc/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dpmlfc'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/dpmlfc/config-rpm.pan b/components/dpmlfc/config-rpm.pan new file mode 100644 index 000000000..9a3e9bc97 --- /dev/null +++ b/components/dpmlfc/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dpmlfc, 13.1.2, 1, 20131015-1127 + # + +unique template components/dpmlfc/config-rpm; + +include { 'components/dpmlfc/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dpmlfc'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-dpmlfc','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/dpmlfc/config-xml.pan b/components/dpmlfc/config-xml.pan new file mode 100644 index 000000000..31fba07a6 --- /dev/null +++ b/components/dpmlfc/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dpmlfc, 13.1.2, 1, 20131015-1127 + # + +unique template components/dpmlfc/config-xml; + +include { 'components/dpmlfc/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/dpmlfc'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/dpmlfc/dpmlfc.pm'); diff --git a/components/dpmlfc/config.pan b/components/dpmlfc/config.pan new file mode 100644 index 000000000..d5b8ac36e --- /dev/null +++ b/components/dpmlfc/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dpmlfc, 13.1.2, 1, 20131015-1127 + # + +unique template components/dpmlfc/config; + +include { 'components/dpmlfc/config-rpm' }; diff --git a/components/dpmlfc/schema.pan b/components/dpmlfc/schema.pan new file mode 100644 index 000000000..58a324e4b --- /dev/null +++ b/components/dpmlfc/schema.pan @@ -0,0 +1,197 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # dpmlfc, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/dpmlfc/schema; + +include { 'quattor/schema' }; + +function component_dpmlfc_global_options_valid = { + if ( !is_defined(SELF) ) { + error('Internal error: DPM/LFC global options undefined in validation function'); + return(false); + }; + + if ( exists(SELF['accessProtocols']) && is_defined(SELF['accessProtocols']) ) { + if ( !is_list(SELF['accessProtocols']) ) { + error("Global option 'accessProtocols' must be a list"); + return(false); + }; + foreach (i;protocol;SELF['accessProtocols']) { + if ( !match(protocol,'https|gsiftp|rfio|xroot') ) { + error('Invalid DPM access protocol specified ('+protocol+'). Must be https, gsiftp, rfio or xroot'); + return(false); + }; + }; + }; + + if ( exists(SELF['controlProtocols']) && is_defined(SELF['controlProtocols']) ) { + if ( !is_list(SELF['controlProtocols']) ) { + error("Global option 'controlProtocols' must be a list"); + return(false); + }; + foreach (i;protocol;SELF['controlProtocols']) { + if ( !match(protocol,'srmv1|srmv2|srmv2.2') ) { + error('Invalid DPM control protocol specified ('+protocol+'). Must be srmv1, srmv2 or srmv2.2'); + return(false); + }; + }; + }; + + true; +}; + +# Validation of xroot access rules +function component_dpmlfc_xroot_access_rules_valid = { + if ( !is_defined(SELF) ) { + error('Internal error: DPM xroot access rules undefined in validation function'); + return(false); + }; + + foreach (i;operation_type;list('authenticated','unauthenticated')) { + if ( is_defined(SELF[operation_type]) ) { + foreach (j;operation;SELF[operation_type]) { + if ( !match(operation,'^(delete|read|write|write-once)$') ) { + error('Invalid operation ('+operation+') specified in xroot access rules for '+operation_type+' operations'); + return(false); + }; + }; + }; + }; + true; +}; + +# Validation of node parameters +function component_dpmlfc_node_config_valid = { + # Check 'requestMaxAge is a valid value. See man dpm. + if ( is_defined(SELF['requestMaxAge']) ) { + if ( !match(SELF['requestMaxAge'],'^[0-9]+[ymdh]*$') ) { + error("'requestMaxAge' must be a number optionally followed by 'y' (year), 'm' (month), 'd' (day) or 'h' (hour)."); + return(false); + } + }; + true; +}; + + +type dpmlfc_component_fs_entry = { + "host" ? string + "name" ? string + "status" ? string +}; + +type dpmlfc_component_pool_entry = { + "def_filesize" ? string + "gc_start_thresh" ? long(0..) + "gc_stop_thresh" ? long(0..) + "def_pintime" ? long(0..) + "gid" ? long(1..) + "group" ? string + "put_retenp" ? long(0..) + "s_type" ? string with match (SELF,'-|D|P|V') + "fs" ? dpmlfc_component_fs_entry[] +}; + +type dpmlfc_component_vo_entry = { + "gid" ? long = -1 +}; + +type dpmlfc_component_node_config = { + "logfile" ? string + "port" ? type_port + "allowCoreDump" ? boolean + "threads" ? long + "maxOpenFiles" ? long +} with component_dpmlfc_node_config_valid(SELF); + +type dpmlfc_component_dpm_node_config = { + include dpmlfc_component_node_config + "requestMaxAge" ? string + "fastThreads" ? long + "slowThreads" ? long + "useSyncGet" ? boolean +}; + +type dpmlfc_component_rfio_gsiftp_node_config = { + include dpmlfc_component_node_config + "portRange" ? string +}; + +type dpmlfc_component_dpns_node_config = { + include dpmlfc_component_node_config + "readonly" ? boolean +}; + +type dpmlfc_component_lfc_node_config = { + include dpmlfc_component_dpns_node_config + "disableAutoVirtualIDs" ? boolean +}; + +type dpmlfc_component_db_conn_options = { + "configfile" ? string + "configmode" ? string = '600' + "server" ? string + "user" : string = "dpmmgr" + "password" : string + "infoFile" ? string + "infoUser" ? string + "infoPwd" ? string +}; + +type dpmlfc_component_global_options = { + "user" ? string + "group" ? string + "db" ? dpmlfc_component_db_conn_options + "installDir" ? string = '/' + "gridmapfile" ? string + "gridmapdir" ? string + "accessProtocols" ? string[] + "controlProtocols" ? string[] +} with component_dpmlfc_global_options_valid(SELF); + +type dpmlfc_component_global_options_tree = { + "dpm" ? dpmlfc_component_global_options + "lfc" ? dpmlfc_component_global_options +}; + +type dpmlfc_component = { + include structure_component + + "dpm" ? dpmlfc_component_dpm_node_config{} + "dpns" ? dpmlfc_component_dpns_node_config{} + "gsiftp" ? dpmlfc_component_rfio_gsiftp_node_config{} + "rfio" ? dpmlfc_component_rfio_gsiftp_node_config{} + "srmv1" ? dpmlfc_component_node_config{} + "srmv2" ? dpmlfc_component_node_config{} + "srmv22" ? dpmlfc_component_node_config{} + "xroot" ? dpmlfc_component_node_config{} + "copyd" ? dpmlfc_component_node_config{} + + "pools" ? dpmlfc_component_pool_entry{} + "vos" ? dpmlfc_component_vo_entry{} + + "lfc" ? dpmlfc_component_lfc_node_config{} + "lfc-dli" ? dpmlfc_component_node_config{} + + "options" ? dpmlfc_component_global_options_tree +}; + +bind "/software/components/dpmlfc" = dpmlfc_component; + + diff --git a/components/drbd/config-common.pan b/components/drbd/config-common.pan index fcacf35db..43637c6b3 100644 --- a/components/drbd/config-common.pan +++ b/components/drbd/config-common.pan @@ -14,7 +14,7 @@ # # # - # drbd, 13.9.0, 1, 20130911-1927 + # drbd, 13.1.2, 1, 20131015-1106 # unique template components/drbd/config-common; @@ -24,7 +24,7 @@ include { 'components/drbd/schema' }; # Set prefix to root of component configuration. prefix '/software/components/drbd'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/drbd/config-rpm.pan b/components/drbd/config-rpm.pan index 06164e8e1..c109131ea 100644 --- a/components/drbd/config-rpm.pan +++ b/components/drbd/config-rpm.pan @@ -25,10 +25,10 @@ unique template components/drbd/config-rpm; include { 'components/drbd/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-drbd", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-drbd", "13.1.2-1", "noarch"); -'/software/components/drbd/version' ?= '13.9.0'; +'/software/components/drbd/version' ?= '13.1.2'; "/software/components/drbd/dependencies/pre" ?= list("spma"); "/software/components/drbd/active" ?= true; diff --git a/components/drbd/config-xml.pan b/components/drbd/config-xml.pan index f675d5b1a..9e76301f2 100644 --- a/components/drbd/config-xml.pan +++ b/components/drbd/config-xml.pan @@ -14,7 +14,7 @@ # # # - # drbd, 13.9.0, 1, 20130911-1927 + # drbd, 13.1.2, 1, 20131015-1106 # unique template components/drbd/config-xml; diff --git a/components/drbd/config.pan b/components/drbd/config.pan index ff7b75c8a..fdcbbe903 100644 --- a/components/drbd/config.pan +++ b/components/drbd/config.pan @@ -14,7 +14,7 @@ # # # - # drbd, 13.9.0, 1, 20130911-1927 + # drbd, 13.1.2, 1, 20131015-1106 # unique template components/drbd/config; diff --git a/components/etcservices/config-common.pan b/components/etcservices/config-common.pan index a6e42ebb8..734d53b75 100644 --- a/components/etcservices/config-common.pan +++ b/components/etcservices/config-common.pan @@ -14,7 +14,7 @@ # # # - # etcservices, 13.9.0, 1, 20130911-1927 + # etcservices, 13.1.2, 1, 20131015-1106 # unique template components/etcservices/config-common; @@ -24,7 +24,7 @@ include { 'components/etcservices/schema' }; # Set prefix to root of component configuration. prefix '/software/components/etcservices'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/etcservices/config-rpm.pan b/components/etcservices/config-rpm.pan index c87a25d7b..224c385cd 100644 --- a/components/etcservices/config-rpm.pan +++ b/components/etcservices/config-rpm.pan @@ -21,7 +21,7 @@ unique template components/etcservices/config-rpm; include {'components/etcservices/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-etcservices", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-etcservices", "13.1.2-1", "noarch"); "/software/components/etcservices/dependencies/pre" ?= list("spma"); diff --git a/components/etcservices/config-xml.pan b/components/etcservices/config-xml.pan index 50065db3e..30c05371a 100644 --- a/components/etcservices/config-xml.pan +++ b/components/etcservices/config-xml.pan @@ -14,7 +14,7 @@ # # # - # etcservices, 13.9.0, 1, 20130911-1927 + # etcservices, 13.1.2, 1, 20131015-1106 # unique template components/etcservices/config-xml; diff --git a/components/etcservices/config.pan b/components/etcservices/config.pan index a4b9fe6af..6d3de194b 100644 --- a/components/etcservices/config.pan +++ b/components/etcservices/config.pan @@ -14,7 +14,7 @@ # # # - # etcservices, 13.9.0, 1, 20130911-1927 + # etcservices, 13.1.2, 1, 20131015-1106 # unique template components/etcservices/config; diff --git a/components/filecopy/config-common.pan b/components/filecopy/config-common.pan index 4b3ab9cb6..91c3f3814 100644 --- a/components/filecopy/config-common.pan +++ b/components/filecopy/config-common.pan @@ -14,7 +14,7 @@ # # # - # filecopy, 13.9.0, 1, 20130911-1927 + # filecopy, 13.1.2, 1, 20131015-1106 # unique template components/filecopy/config-common; @@ -24,7 +24,7 @@ include { 'components/filecopy/schema' }; # Set prefix to root of component configuration. prefix '/software/components/filecopy'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/filecopy/config-rpm.pan b/components/filecopy/config-rpm.pan index 121fa4352..45722babf 100644 --- a/components/filecopy/config-rpm.pan +++ b/components/filecopy/config-rpm.pan @@ -19,9 +19,9 @@ unique template components/filecopy/config-rpm; include { 'components/filecopy/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-filecopy", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-filecopy", "13.1.2-1", "noarch"); '/software/components/filecopy/dependencies/pre' ?= list('spma'); -'/software/components/filecopy/version' = '13.9.0'; +'/software/components/filecopy/version' = '13.1.2'; diff --git a/components/filecopy/config-xml.pan b/components/filecopy/config-xml.pan index 59243387c..b30304378 100644 --- a/components/filecopy/config-xml.pan +++ b/components/filecopy/config-xml.pan @@ -14,7 +14,7 @@ # # # - # filecopy, 13.9.0, 1, 20130911-1927 + # filecopy, 13.1.2, 1, 20131015-1106 # unique template components/filecopy/config-xml; diff --git a/components/filecopy/config.pan b/components/filecopy/config.pan index 37cf86c80..0dc78c5db 100644 --- a/components/filecopy/config.pan +++ b/components/filecopy/config.pan @@ -14,7 +14,7 @@ # # # - # filecopy, 13.9.0, 1, 20130911-1927 + # filecopy, 13.1.2, 1, 20131015-1106 # unique template components/filecopy/config; diff --git a/components/filesystems/config-common.pan b/components/filesystems/config-common.pan index 1583b1cbe..9f296b8a6 100644 --- a/components/filesystems/config-common.pan +++ b/components/filesystems/config-common.pan @@ -14,7 +14,7 @@ # # # - # filesystems, 13.9.0, 1, 20130911-1927 + # filesystems, 13.1.2, 1, 20131015-1106 # unique template components/filesystems/config-common; @@ -24,7 +24,7 @@ include { 'components/filesystems/schema' }; # Set prefix to root of component configuration. prefix '/software/components/filesystems'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/filesystems/config-rpm.pan b/components/filesystems/config-rpm.pan index ae4beda7b..370122bcb 100644 --- a/components/filesystems/config-rpm.pan +++ b/components/filesystems/config-rpm.pan @@ -20,7 +20,7 @@ include {'components/filesystems/schema'}; include {'components/fstab/config'}; -"/software/packages" = pkg_repl("ncm-filesystems", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-filesystems", "13.1.2-1", "noarch"); "/software/components/filesystems/dependencies/post" = list ("fstab"); "/software/components/filesystems/dependencies/pre" = list ("spma"); diff --git a/components/filesystems/config-xml.pan b/components/filesystems/config-xml.pan index 04ce2a684..fd5add825 100644 --- a/components/filesystems/config-xml.pan +++ b/components/filesystems/config-xml.pan @@ -14,7 +14,7 @@ # # # - # filesystems, 13.9.0, 1, 20130911-1927 + # filesystems, 13.1.2, 1, 20131015-1106 # unique template components/filesystems/config-xml; diff --git a/components/filesystems/config.pan b/components/filesystems/config.pan index 59b9099d4..480db3672 100644 --- a/components/filesystems/config.pan +++ b/components/filesystems/config.pan @@ -14,7 +14,7 @@ # # # - # filesystems, 13.9.0, 1, 20130911-1927 + # filesystems, 13.1.2, 1, 20131015-1106 # unique template components/filesystems/config; diff --git a/components/fmonagent/config-common.pan b/components/fmonagent/config-common.pan index 0764cbc44..06068f5e6 100644 --- a/components/fmonagent/config-common.pan +++ b/components/fmonagent/config-common.pan @@ -14,7 +14,7 @@ # # # - # fmonagent, 13.9.0, 1, 20130911-1927 + # fmonagent, 13.1.2, 1, 20131015-1106 # unique template components/fmonagent/config-common; @@ -24,7 +24,7 @@ include { 'components/fmonagent/schema' }; # Set prefix to root of component configuration. prefix '/software/components/fmonagent'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/fmonagent/config-rpm.pan b/components/fmonagent/config-rpm.pan index 52e2149eb..038c156fd 100644 --- a/components/fmonagent/config-rpm.pan +++ b/components/fmonagent/config-rpm.pan @@ -21,10 +21,10 @@ unique template components/fmonagent/config-rpm; include { 'components/fmonagent/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-fmonagent", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-fmonagent", "13.1.2-1", "noarch"); -'/software/components/fmonagent/version' ?= '13.9.0'; +'/software/components/fmonagent/version' ?= '13.1.2'; "/software/components/fmonagent/dependencies/pre" ?= list("spma"); "/software/components/fmonagent/active" ?= true; diff --git a/components/fmonagent/config-xml.pan b/components/fmonagent/config-xml.pan index c322045c5..3f20e78fa 100644 --- a/components/fmonagent/config-xml.pan +++ b/components/fmonagent/config-xml.pan @@ -14,7 +14,7 @@ # # # - # fmonagent, 13.9.0, 1, 20130911-1927 + # fmonagent, 13.1.2, 1, 20131015-1106 # unique template components/fmonagent/config-xml; diff --git a/components/fmonagent/config.pan b/components/fmonagent/config.pan index 44fbb3d71..452f53baa 100644 --- a/components/fmonagent/config.pan +++ b/components/fmonagent/config.pan @@ -14,7 +14,7 @@ # # # - # fmonagent, 13.9.0, 1, 20130911-1927 + # fmonagent, 13.1.2, 1, 20131015-1106 # unique template components/fmonagent/config; diff --git a/components/frontiersquid/config-common.pan b/components/frontiersquid/config-common.pan new file mode 100644 index 000000000..9617c49c5 --- /dev/null +++ b/components/frontiersquid/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Guillaume PHILIPPON +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # frontiersquid, 13.1.2, 1, 20131015-1127 + # + +unique template components/frontiersquid/config-common; + +include { 'components/frontiersquid/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/frontiersquid'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/frontiersquid/config-rpm.pan b/components/frontiersquid/config-rpm.pan new file mode 100644 index 000000000..8e148f501 --- /dev/null +++ b/components/frontiersquid/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Guillaume PHILIPPON +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # frontiersquid, 13.1.2, 1, 20131015-1127 + # + +unique template components/frontiersquid/config-rpm; + +include { 'components/frontiersquid/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/frontiersquid'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-frontiersquid','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/frontiersquid/config-xml.pan b/components/frontiersquid/config-xml.pan new file mode 100644 index 000000000..2a23c044e --- /dev/null +++ b/components/frontiersquid/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Guillaume PHILIPPON +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # frontiersquid, 13.1.2, 1, 20131015-1127 + # + +unique template components/frontiersquid/config-xml; + +include { 'components/frontiersquid/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/frontiersquid'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/frontiersquid/frontiersquid.pm'); diff --git a/components/frontiersquid/config.pan b/components/frontiersquid/config.pan new file mode 100644 index 000000000..e22b4fbdc --- /dev/null +++ b/components/frontiersquid/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Guillaume PHILIPPON +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # frontiersquid, 13.1.2, 1, 20131015-1127 + # + +unique template components/frontiersquid/config; + +include { 'components/frontiersquid/config-rpm' }; diff --git a/components/frontiersquid/schema.pan b/components/frontiersquid/schema.pan new file mode 100644 index 000000000..2e181e1c5 --- /dev/null +++ b/components/frontiersquid/schema.pan @@ -0,0 +1,38 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Guillaume PHILIPPON +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # frontiersquid, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/frontiersquid/schema; + +include { 'quattor/schema' }; + +type frontiersquid_component_type = { + include structure_component + 'rpmhome' : string = '/' + 'postinstall' : string = '/etc/squid/postinstall' + 'squidconf' : string = '/etc/squid/squidconf' + 'username' : string = 'squid' + 'group' : string = 'squid' + 'networks' : string = '0.0.0.0/32' + 'cache_mem' : long = 128 + 'cache_dir' : long = 10000 +}; + +bind "/software/components/frontiersquid" = frontiersquid_component_type; + diff --git a/components/fsprobe/config-common.pan b/components/fsprobe/config-common.pan index 0cdf44df4..83d6bb278 100644 --- a/components/fsprobe/config-common.pan +++ b/components/fsprobe/config-common.pan @@ -14,7 +14,7 @@ # # # - # fsprobe, 13.9.0, 1, 20130911-1927 + # fsprobe, 13.1.2, 1, 20131015-1106 # unique template components/fsprobe/config-common; @@ -24,7 +24,7 @@ include { 'components/fsprobe/schema' }; # Set prefix to root of component configuration. prefix '/software/components/fsprobe'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/fsprobe/config-rpm.pan b/components/fsprobe/config-rpm.pan index e29535a5b..b1d5e5ed4 100644 --- a/components/fsprobe/config-rpm.pan +++ b/components/fsprobe/config-rpm.pan @@ -22,7 +22,7 @@ include {'components/fsprobe/functions'}; # Package to install: # Package to install -"/software/packages" = pkg_repl("ncm-fsprobe", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-fsprobe", "13.1.2-1", "noarch"); # This component should be run after ncm-accounts, if present. "/software/components/fsprobe/dependencies/pre" = { diff --git a/components/fsprobe/config-xml.pan b/components/fsprobe/config-xml.pan index c68b5877b..337dd091d 100644 --- a/components/fsprobe/config-xml.pan +++ b/components/fsprobe/config-xml.pan @@ -14,7 +14,7 @@ # # # - # fsprobe, 13.9.0, 1, 20130911-1927 + # fsprobe, 13.1.2, 1, 20131015-1106 # unique template components/fsprobe/config-xml; diff --git a/components/fsprobe/config.pan b/components/fsprobe/config.pan index c4e80538a..d1e88d956 100644 --- a/components/fsprobe/config.pan +++ b/components/fsprobe/config.pan @@ -14,7 +14,7 @@ # # # - # fsprobe, 13.9.0, 1, 20130911-1927 + # fsprobe, 13.1.2, 1, 20131015-1106 # unique template components/fsprobe/config; diff --git a/components/fstab/config-common.pan b/components/fstab/config-common.pan index 35ef2f47f..73135d86f 100644 --- a/components/fstab/config-common.pan +++ b/components/fstab/config-common.pan @@ -14,7 +14,7 @@ # # # - # fstab, 13.9.0, 1, 20130911-1927 + # fstab, 13.1.2, 1, 20131015-1106 # unique template components/fstab/config-common; @@ -24,7 +24,7 @@ include { 'components/fstab/schema' }; # Set prefix to root of component configuration. prefix '/software/components/fstab'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/fstab/config-rpm.pan b/components/fstab/config-rpm.pan index 2e9df41d5..b14a4a65e 100644 --- a/components/fstab/config-rpm.pan +++ b/components/fstab/config-rpm.pan @@ -18,7 +18,7 @@ unique template components/fstab/config-rpm; include {'components/fstab/schema'}; -"/software/packages" = pkg_repl("ncm-fstab", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-fstab", "13.1.2-1", "noarch"); "/software/components/fstab/dependencies/pre" = list ("spma"); "/software/components/fstab/active" ?= true; diff --git a/components/fstab/config-xml.pan b/components/fstab/config-xml.pan index 5cb1d6e45..c98054023 100644 --- a/components/fstab/config-xml.pan +++ b/components/fstab/config-xml.pan @@ -14,7 +14,7 @@ # # # - # fstab, 13.9.0, 1, 20130911-1927 + # fstab, 13.1.2, 1, 20131015-1106 # unique template components/fstab/config-xml; diff --git a/components/fstab/config.pan b/components/fstab/config.pan index e0224e00c..6a18d2d1c 100644 --- a/components/fstab/config.pan +++ b/components/fstab/config.pan @@ -14,7 +14,7 @@ # # # - # fstab, 13.9.0, 1, 20130911-1927 + # fstab, 13.1.2, 1, 20131015-1106 # unique template components/fstab/config; diff --git a/components/gacl/config-common.pan b/components/gacl/config-common.pan new file mode 100644 index 000000000..98634b66f --- /dev/null +++ b/components/gacl/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gacl, 13.1.2, 1, 20131015-1127 + # + +unique template components/gacl/config-common; + +include { 'components/gacl/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gacl'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/gacl/config-rpm.pan b/components/gacl/config-rpm.pan new file mode 100644 index 000000000..de75dc880 --- /dev/null +++ b/components/gacl/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gacl, 13.1.2, 1, 20131015-1127 + # + +unique template components/gacl/config-rpm; + +include { 'components/gacl/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gacl'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-gacl','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/gacl/config-xml.pan b/components/gacl/config-xml.pan new file mode 100644 index 000000000..9d9307a82 --- /dev/null +++ b/components/gacl/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gacl, 13.1.2, 1, 20131015-1127 + # + +unique template components/gacl/config-xml; + +include { 'components/gacl/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gacl'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/gacl/gacl.pm'); diff --git a/components/gacl/config.pan b/components/gacl/config.pan new file mode 100644 index 000000000..5975dc099 --- /dev/null +++ b/components/gacl/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gacl, 13.1.2, 1, 20131015-1127 + # + +unique template components/gacl/config; + +include { 'components/gacl/config-rpm' }; diff --git a/components/gacl/schema.pan b/components/gacl/schema.pan new file mode 100644 index 000000000..c146a7ec4 --- /dev/null +++ b/components/gacl/schema.pan @@ -0,0 +1,35 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gacl, 13.1.2, 1, 20131015-1127 + # +# +# Coding style: emulate characters with 4 spaces, thanks! +################################################################################ + + +declaration template components/gacl/schema; + +include { 'quattor/schema' }; + +type gacl_component = { + include structure_component + + 'aclFile' : string = '/opt/glite/etc/glite_wms_wmproxy.gacl' +}; + +bind "/software/components/gacl" = gacl_component; + diff --git a/components/ganglia/config-common.pan b/components/ganglia/config-common.pan index 80fc28b41..c41eca7e6 100644 --- a/components/ganglia/config-common.pan +++ b/components/ganglia/config-common.pan @@ -14,7 +14,7 @@ # # # - # ganglia, 13.9.0, 1, 20130911-1927 + # ganglia, 13.1.2, 1, 20131015-1106 # unique template components/ganglia/config-common; @@ -24,7 +24,7 @@ include { 'components/ganglia/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ganglia'; -#'version' = '13.9.0-1'; +#'version' = '13.1.2-1'; 'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ganglia/config-rpm.pan b/components/ganglia/config-rpm.pan index 1bb3bb2ef..9f6249429 100644 --- a/components/ganglia/config-rpm.pan +++ b/components/ganglia/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # ganglia, 13.9.0, 1, 20130911-1927 + # ganglia, 13.1.2, 1, 20131015-1106 # unique template components/ganglia/config-rpm; @@ -25,6 +25,6 @@ include { 'components/ganglia/config-common' }; prefix '/software/components/ganglia'; # Install Quattor configuration module via RPM package. -'/software/packages' = pkg_repl('ncm-ganglia','13.9.0-1','noarch'); +'/software/packages' = pkg_repl('ncm-ganglia','13.1.2-1','noarch'); 'dependencies/pre' ?= list('spma'); diff --git a/components/ganglia/config-xml.pan b/components/ganglia/config-xml.pan index f215ef0c1..ccce828d1 100644 --- a/components/ganglia/config-xml.pan +++ b/components/ganglia/config-xml.pan @@ -14,7 +14,7 @@ # # # - # ganglia, 13.9.0, 1, 20130911-1927 + # ganglia, 13.1.2, 1, 20131015-1106 # unique template components/ganglia/config-xml; diff --git a/components/ganglia/config.pan b/components/ganglia/config.pan index cbb2b6b0b..e41db7410 100644 --- a/components/ganglia/config.pan +++ b/components/ganglia/config.pan @@ -14,7 +14,7 @@ # # # - # ganglia, 13.9.0, 1, 20130911-1927 + # ganglia, 13.1.2, 1, 20131015-1106 # unique template components/ganglia/config; diff --git a/components/ganglia/schema.pan b/components/ganglia/schema.pan index 255f1f97d..9bd677e3e 100644 --- a/components/ganglia/schema.pan +++ b/components/ganglia/schema.pan @@ -14,7 +14,7 @@ # # # - # ganglia, 13.9.0, 1, 20130911-1927 + # ganglia, 13.1.2, 1, 20131015-1106 # @author{ diff --git a/components/gip2/config-common.pan b/components/gip2/config-common.pan new file mode 100644 index 000000000..db79c3f11 --- /dev/null +++ b/components/gip2/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gip2, 13.1.2, 1, 20131015-1127 + # + +unique template components/gip2/config-common; + +include { 'components/gip2/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gip2'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/gip2/config-rpm.pan b/components/gip2/config-rpm.pan new file mode 100644 index 000000000..07318aafa --- /dev/null +++ b/components/gip2/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gip2, 13.1.2, 1, 20131015-1127 + # + +unique template components/gip2/config-rpm; + +include { 'components/gip2/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gip2'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-gip2','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/gip2/config-xml.pan b/components/gip2/config-xml.pan new file mode 100644 index 000000000..a6f5b601a --- /dev/null +++ b/components/gip2/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gip2, 13.1.2, 1, 20131015-1127 + # + +unique template components/gip2/config-xml; + +include { 'components/gip2/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gip2'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/gip2/gip2.pm'); diff --git a/components/gip2/config.pan b/components/gip2/config.pan new file mode 100644 index 000000000..cd94487af --- /dev/null +++ b/components/gip2/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gip2, 13.1.2, 1, 20131015-1127 + # + +unique template components/gip2/config; + +include { 'components/gip2/config-rpm' }; diff --git a/components/gip2/schema.pan b/components/gip2/schema.pan new file mode 100644 index 000000000..8c3e6f281 --- /dev/null +++ b/components/gip2/schema.pan @@ -0,0 +1,58 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gip2, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/gip2/schema; + +include { 'quattor/schema' }; +include { 'pan/types' }; + +type structure_gip2_attribute = string[]; + +type structure_gip2_ldif = { + 'template' : string + 'ldifFile' : string + 'entries' : structure_gip2_attribute{}{} + 'staticInfoArgs' ? string +}; + +type gip2_component = { + include structure_component + 'user' : string + 'group' : string = 'root' + 'flavor' : string = 'lcg' with match(SELF,'lcg|glite') + 'basedir' : string + 'etcDir' ? string + 'ldifDir' ? string + 'pluginDir' ? string + 'providerDir' ? string + 'workDirs' ? string[] + 'staticInfoCmd' : string + 'bdiiRestartAllowed' : boolean = true + + 'confFiles' ? string{} + 'ldif' ? structure_gip2_ldif{} + 'plugin' ? string{} + 'provider' ? string{} + 'scripts' ? string{} + 'stubs' ? structure_gip2_attribute{}{}{} + 'external' ? string[] +}; + +bind '/software/components/gip2' = gip2_component; diff --git a/components/glitestartup/config-common.pan b/components/glitestartup/config-common.pan new file mode 100644 index 000000000..af0580d0a --- /dev/null +++ b/components/glitestartup/config-common.pan @@ -0,0 +1,32 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # + +unique template components/glitestartup/config-common; + +include { 'components/glitestartup/schema' }; +include { 'components/glitestartup/functions' }; + +# Set prefix to root of component configuration. +prefix '/software/components/glitestartup'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/glitestartup/config-rpm.pan b/components/glitestartup/config-rpm.pan new file mode 100644 index 000000000..c7670504f --- /dev/null +++ b/components/glitestartup/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # + +unique template components/glitestartup/config-rpm; + +include { 'components/glitestartup/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/glitestartup'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-glitestartup','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/glitestartup/config-xml.pan b/components/glitestartup/config-xml.pan new file mode 100644 index 000000000..f0b45711d --- /dev/null +++ b/components/glitestartup/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # + +unique template components/glitestartup/config-xml; + +include { 'components/glitestartup/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/glitestartup'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/glitestartup/glitestartup.pm'); diff --git a/components/glitestartup/config.pan b/components/glitestartup/config.pan new file mode 100644 index 000000000..0914eb625 --- /dev/null +++ b/components/glitestartup/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # + +unique template components/glitestartup/config; + +include { 'components/glitestartup/config-rpm' }; diff --git a/components/glitestartup/functions.pan b/components/glitestartup/functions.pan new file mode 100644 index 000000000..1ecb027ff --- /dev/null +++ b/components/glitestartup/functions.pan @@ -0,0 +1,97 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # +# + +unique template components/glitestartup/functions; + +# Function to add a gLite service with optional attributes. +# If the service already exists, its attributes are modified. +# +# Return value : nlist of gLite services +# +# Expect to be called as : +# '/software/components/glitestartup/services' = glitestartup_mod_service(service_name[,service_attrs]); +# +# where : +# - service_name is the name of the gLite service +# - service_attrs is a nlist of valid attributes (see schema.tpl) + +function glitestartup_mod_service = { + function_name = 'glitestartup_mod_service'; + if ( ARGC < 1 ) { + error(function_name+': missing required argument (service name)'); + } else if ( ARGC > 2 ){ + error(function_name+': too many arguments ('+to_string(ARGC)+')'); + }; + + if ( ARGC == 2 ) { + SELF[ARGV[0]] = ARGV[1]; + } else { + SELF[ARGV[0]] = nlist(); + }; + + SELF; +}; + + +# Function to add a new dependency to ncm-glitestartup. +# This function allows to avoid duplicating dependencies as this component may be used by many others. +# May be a candidate for inclusion in component core included into each component... Nothing component specific there. +# +# Calling sequence : +# '/software/components/glitestartup/dependencies/pre' (or post) = glitestartup_add_dependency(dependency_list); +# +# with dependency_list a list of dependency. + +function glitestartup_add_dependency = { + function_name = 'glitestartup_add_dependency'; + deps = SELF; + tmpdeps = nlist(); + + if ( (ARGC != 1) || !is_list(ARGV[0]) ) { + error(function_name+': argument must be list of dependencies'); + }; + + if ( !is_defined(deps) ) { + deps = list(); + } else if ( !is_list(deps) ) { + error('component dependencies must be a list'); + } else { + foreach (i;dep;deps) { + tmpdeps[dep] = ''; + }; + }; + + foreach (i;dep;ARGV[0]) { + if ( !exists(tmpdeps[dep]) ) { + tmpdeps[dep] = ''; + } + }; + + deps = list(); + foreach (dep;v;tmpdeps) { + deps[length(deps)] = dep; + }; + + if ( length(deps) > 0 ) { + deps; + } else { + null; + }; +}; diff --git a/components/glitestartup/schema.pan b/components/glitestartup/schema.pan new file mode 100644 index 000000000..679e8515f --- /dev/null +++ b/components/glitestartup/schema.pan @@ -0,0 +1,51 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # glitestartup, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/glitestartup/schema; + +include { 'quattor/schema' }; + +include { 'pan/types' }; + +type glitestartup_component_service = { + 'args' ? string = '' +}; + +type glitestartup_component_post_restart = { + 'cmd' : string + 'expectedStatus' ? long +}; + +type glitestartup_component = { + include structure_component + + 'configFile' : string = '/opt/glite/etc/gLiteservices' + 'initScript' : string = '/etc/rc.d/init.d/gLite' + 'disableOutput' ? boolean + 'disableError' ? boolean + 'restartEnv' ? string[] + 'postRestart' ? glitestartup_component_post_restart[] + 'restartServices' ? boolean + 'createProxy' : boolean = true + 'scriptPaths' : string[] = list('/opt/glite/etc/init.d') + 'services' : glitestartup_component_service{} +}; + +bind '/software/components/glitestartup' = glitestartup_component; diff --git a/components/globuscfg/config-common.pan b/components/globuscfg/config-common.pan new file mode 100644 index 000000000..976bf9217 --- /dev/null +++ b/components/globuscfg/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Novak Judit +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # globuscfg, 13.1.2, 1, 20131015-1127 + # + +unique template components/globuscfg/config-common; + +include { 'components/globuscfg/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/globuscfg'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/globuscfg/config-rpm.pan b/components/globuscfg/config-rpm.pan new file mode 100644 index 000000000..8e23f2999 --- /dev/null +++ b/components/globuscfg/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Novak Judit +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # globuscfg, 13.1.2, 1, 20131015-1127 + # + +unique template components/globuscfg/config-rpm; + +include { 'components/globuscfg/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/globuscfg'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-globuscfg','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/globuscfg/config-xml.pan b/components/globuscfg/config-xml.pan new file mode 100644 index 000000000..783165f69 --- /dev/null +++ b/components/globuscfg/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Novak Judit +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # globuscfg, 13.1.2, 1, 20131015-1127 + # + +unique template components/globuscfg/config-xml; + +include { 'components/globuscfg/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/globuscfg'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/globuscfg/globuscfg.pm'); diff --git a/components/globuscfg/config.pan b/components/globuscfg/config.pan new file mode 100644 index 000000000..e54316027 --- /dev/null +++ b/components/globuscfg/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Novak Judit +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # globuscfg, 13.1.2, 1, 20131015-1127 + # + +unique template components/globuscfg/config; + +include { 'components/globuscfg/config-rpm' }; diff --git a/components/globuscfg/schema.pan b/components/globuscfg/schema.pan new file mode 100644 index 000000000..9fff7be65 --- /dev/null +++ b/components/globuscfg/schema.pan @@ -0,0 +1,130 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Novak Judit +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # globuscfg, 13.1.2, 1, 20131015-1127 + # +# + + +declaration template components/globuscfg/schema; + +include { 'quattor/schema' }; + +type reg_type = { + "recordname" : string + "regname" ? string + "reghn" ? string + "regport" ? type_port + "regperiod" ? long + "ttl" ? long +}; + +type globus_mds_gris_type = { + "suffix" ? string + "provider" ? string{} + "registration" ? reg_type[] +}; + +type globus_mds_giis_allowedregs_type = { + "recordname" : string + "name" ? string + "allowreg" ? string[] +}; + +type globus_mds_giis_reg_type = { + "regname" : string + "reghn" : string + "regport" ? type_port + "regperiod" ? long + "ttl" ? long + "name" ? string +}; + +type globus_mds_giis_type = { + "allowedregs" ? globus_mds_giis_allowedregs_type[] + "registration" ? globus_mds_giis_reg_type{} +}; + +type globus_mds_type = { + "globus_flavor_name" ? string + "user" ? string + "x509_user_cert" ? string + "x509_user_key" ? string + "gris" ? globus_mds_gris_type + "giis" ? globus_mds_giis_type +}; + +type globus_gridftp_type = { + "globus_flavor_name" ? string + "X509_USER_CERT" ? string + "X509_USER_KEY" ? string + "ftpd" ? string + "port" ? type_port + "umask" ? string + "log" ? string + "user" ? string + "maxConnections" ? long + "options" ? string +}; + +type globus_gatekeeper_jobmanager_type = { + "recordname" : string + "type" ? string + "job_manager" ? string + "extra_config" ? string +}; + +type globus_gatekeeper_type = { + "globus_flavor_name" ? string + "job_manager_path" ? string[] + "globus_gatekeeper" ? string + "extra_options" ? string + "user" ? string + "port" ? type_port + "logfile" ? string + "jobmanagers" ? globus_gatekeeper_jobmanager_type[] +}; + +type globus_global_type = { + "services" ? string[] + "paths" ? string[] + "globus_flavor_name" : string + "GLOBUS_LOCATION" : string = '/opt/globus' + "GPT_LOCATION" : string = '/opt/gpt' + "GLOBUS_CONFIG" : string = '/etc/globus.conf' + "GLOBUS_TCP_PORT_RANGE" ? string + "GLOBUS_UDP_PORT_RANGE" ? string + "LD_LIBRARY_PATH" ? string # "appended to existing LD_LIBRARY_PATH" + "x509_user_cert" ? string + "x509_user_key" ? string + "x509_cert_dir" : string = '/etc/grid-security/certificates' + "gridmap" ? string + "gridmapdir" ? string + "mds" ? globus_mds_type + "gridftp" ? globus_gridftp_type + "gatekeeper" ? globus_gatekeeper_type + "sysconfigUpdate" ? boolean = true # "if false, don't update /etc/sysconfig/globus" +}; + +type globuscfg_component_type = { + include structure_component + include globus_global_type +}; + + +bind "/software/components/globuscfg" = globuscfg_component_type; + + diff --git a/components/gmetad/config-common.pan b/components/gmetad/config-common.pan index b5600430d..a17883493 100644 --- a/components/gmetad/config-common.pan +++ b/components/gmetad/config-common.pan @@ -14,7 +14,7 @@ # # # - # gmetad, 13.9.0, 1, 20130911-1927 + # gmetad, 13.1.2, 1, 20131015-1106 # unique template components/gmetad/config-common; @@ -24,7 +24,7 @@ include { 'components/gmetad/schema' }; # Set prefix to root of component configuration. prefix '/software/components/gmetad'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/gmetad/config-rpm.pan b/components/gmetad/config-rpm.pan index e26825aef..e513f97cf 100644 --- a/components/gmetad/config-rpm.pan +++ b/components/gmetad/config-rpm.pan @@ -24,7 +24,7 @@ unique template components/gmetad/config-rpm; include {'components/gmetad/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-gmetad", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-gmetad", "13.1.2-1", "noarch"); "/software/components/gmetad/dependencies/pre" ?= list ("spma", "accounts"); diff --git a/components/gmetad/config-xml.pan b/components/gmetad/config-xml.pan index e4da06278..2ca43d0b5 100644 --- a/components/gmetad/config-xml.pan +++ b/components/gmetad/config-xml.pan @@ -14,7 +14,7 @@ # # # - # gmetad, 13.9.0, 1, 20130911-1927 + # gmetad, 13.1.2, 1, 20131015-1106 # unique template components/gmetad/config-xml; diff --git a/components/gmetad/config.pan b/components/gmetad/config.pan index ddfd3760b..24971c733 100644 --- a/components/gmetad/config.pan +++ b/components/gmetad/config.pan @@ -14,7 +14,7 @@ # # # - # gmetad, 13.9.0, 1, 20130911-1927 + # gmetad, 13.1.2, 1, 20131015-1106 # unique template components/gmetad/config; diff --git a/components/gmond/config-common.pan b/components/gmond/config-common.pan index b789daabc..ef411d594 100644 --- a/components/gmond/config-common.pan +++ b/components/gmond/config-common.pan @@ -14,7 +14,7 @@ # # # - # gmond, 13.9.0, 1, 20130911-1927 + # gmond, 13.1.2, 1, 20131015-1106 # unique template components/gmond/config-common; @@ -24,7 +24,7 @@ include { 'components/gmond/schema' }; # Set prefix to root of component configuration. prefix '/software/components/gmond'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/gmond/config-rpm.pan b/components/gmond/config-rpm.pan index e9754ecdb..c6d48e439 100644 --- a/components/gmond/config-rpm.pan +++ b/components/gmond/config-rpm.pan @@ -24,7 +24,7 @@ unique template components/gmond/config-rpm; include {'components/gmond/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-gmond", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-gmond", "13.1.2-1", "noarch"); "/software/components/gmond/dependencies/pre" ?= list ("spma", "accounts"); diff --git a/components/gmond/config-xml.pan b/components/gmond/config-xml.pan index 311b09a00..b18c73001 100644 --- a/components/gmond/config-xml.pan +++ b/components/gmond/config-xml.pan @@ -14,7 +14,7 @@ # # # - # gmond, 13.9.0, 1, 20130911-1927 + # gmond, 13.1.2, 1, 20131015-1106 # unique template components/gmond/config-xml; diff --git a/components/gmond/config.pan b/components/gmond/config.pan index c05e7302b..96e11ac73 100644 --- a/components/gmond/config.pan +++ b/components/gmond/config.pan @@ -14,7 +14,7 @@ # # # - # gmond, 13.9.0, 1, 20130911-1927 + # gmond, 13.1.2, 1, 20131015-1106 # unique template components/gmond/config; diff --git a/components/gold/config-common.pan b/components/gold/config-common.pan new file mode 100644 index 000000000..f37a9ab94 --- /dev/null +++ b/components/gold/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gold, 13.1.2, 1, 20131015-1127 + # + +unique template components/gold/config-common; + +include { 'components/gold/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gold'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/gold/config-rpm.pan b/components/gold/config-rpm.pan new file mode 100644 index 000000000..5133320a2 --- /dev/null +++ b/components/gold/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gold, 13.1.2, 1, 20131015-1127 + # + +unique template components/gold/config-rpm; + +include { 'components/gold/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gold'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-gold','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/gold/config-xml.pan b/components/gold/config-xml.pan new file mode 100644 index 000000000..42b775f57 --- /dev/null +++ b/components/gold/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gold, 13.1.2, 1, 20131015-1127 + # + +unique template components/gold/config-xml; + +include { 'components/gold/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gold'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/gold/gold.pm'); diff --git a/components/gold/config.pan b/components/gold/config.pan new file mode 100644 index 000000000..6b2a8358b --- /dev/null +++ b/components/gold/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gold, 13.1.2, 1, 20131015-1127 + # + +unique template components/gold/config; + +include { 'components/gold/config-rpm' }; diff --git a/components/gold/schema.pan b/components/gold/schema.pan new file mode 100644 index 000000000..d19435b57 --- /dev/null +++ b/components/gold/schema.pan @@ -0,0 +1,148 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gold, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/gold/schema; + +include { 'quattor/schema' }; + +type gold_component_server = { + "super.user" : string = 'root' + "server.host" : string = 'localhost.localdomain' + "server.port" ? long # 7112 + "database.datasource" : string = 'DBI:Pg:dbname=gold;host=localhost.localdomain' + "database.user" ? string # NONE + "database.password" ? string # NONE + "response.chunksize" : long = 100000 + "currency.precision" ? long # 0 + "security.authentication" ? string # true + "security.encryption" ? string # false + "account.autogen" ? string # true + "allocation.autogen" ? string # true + "machine.autogen" ? string # false + "machine.default" ? string # NONE + "project.autogen" ? string # false + "project.default" ? string # NONE + "user.autogen" ? string # false + "user.default" ? string # NONE + "log4perl.logger" : string = 'TRACE, Log, Screen' + "log4perl.appender.Log.Threshold" : string = 'TRACE' + "log4perl.appender.Screen.Threshold" : string = 'FATAL' + "log4perl.logger.Message" ? string # TRACE, + "log4perl.appender.Log" ? string # Log::Log4perl::Appender::File + "log4perl.appender.Log" : string = 'Log::Dispatch::FileRotate' + "log4perl.appender.Log.filename" : string = '/usr/local/gold/log/goldd.log' + "log4perl.appender.Log.mode" : string = 'append' + "log4perl.appender.Log.size" : long = 10000000 + "log4perl.appender.Log.max" : long = 7 + "log4perl.appender.Log.layout" : string = 'PatternLayout' + "log4perl.appender.Log.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %M %m%n' + "log4perl.appender.Screen" : string = 'Log::Log4perl::Appender::Screen' + "log4perl.appender.Screen.layout" : string = 'PatternLayout' + "log4perl.appender.Screen.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %M [%F:%L] %m%n' +}; + + +type gold_component_client = { + "server.host" : string = 'localhost.localdomain' + "server.port" ? long # 7112 + "server.backup" ? string # NONE + "security.authentication" ? string # true + "security.encryption" ? string # false + "security.token.type" ? string # symmetric + "wire.protocol" ? string # SSSRMAP + "response.chunking" ? string # false + "response.chunksize" ? long # 0 + "currency.precision" ? long # 0 + "account.show" ? string # Id,Name,Amount,Projects,Users,Machines,Description + "allocation.show" ? string # Id,Account,Active,StartTime,EndTime,Amount,CreditLimit,Deposited + "balance.show" ? string # Id,Name,Amount,Reserved,Balance,CreditLimit,Available + "job.show" ? string # Id,JobId,User,Project,Machine,Queue,QualityOfService,Stage,Charge,Processors,Nodes,WallDuration,StartTime,EndTime,Description + "machine.show" ? string # Name,Active,Architecture,OperatingSystem,Description + "project.show" ? string # Name,Active,Users,Machines,Description + "quotations.show" ? string # Id,Amount,Job,Project,User,Machine,StartTime,EndTime,WallDuration,Uses,ChargeRates,Description + "reservation.show" ? string # Id,Name,Amount,StartTime,EndTime,Job,User,Project,Machine,Accounts,Description + "transaction.show" ? string # Id,Object,Action,Actor,Name,Child,JobId,Amount,Delta,Account,Project,User,Machine,Allocation,Count,Description + "user.show" ? string # Name,Active,CommonName,PhoneNumber,EmailAddress,DefaultProject,Description + "log4perl.logger" : string = 'TRACE, Log, Screen' + "log4perl.appender.Log.Threshold" : string = 'INFO' + "log4perl.appender.Screen.Threshold" : string = 'FATAL' + "log4perl.logger.Message" ? string # TRACE, + "log4perl.appender.Log" ? string # Log::Log4perl::Appender::File + "log4perl.appender.Log" : string = 'Log::Dispatch::FileRotate' + "log4perl.appender.Log.filename" : string = '/usr/local/gold/log/gold.log' + "log4perl.appender.Log.filename" ? string # sub + "log4perl.appender.Log.mode" : string = 'append' + "log4perl.appender.Log.size" : long = 10000000 + "log4perl.appender.Log.max" : long = 7 + "log4perl.appender.Log.layout" : string = 'PatternLayout' + "log4perl.appender.Log.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %M %m%n' + "log4perl.appender.Screen" : string = 'Log::Log4perl::Appender::Screen' + "log4perl.appender.Screen.layout" : string = 'PatternLayout' + "log4perl.appender.Screen.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %M [%F:%L] %m%n' +}; + +type gold_component_cgiclient = { + "server.host" : string = 'localhost.localdomain' + "server.port" ? long # 7112 + "server.backup" ? string # NONE + "security.authentication" ? string # true + "security.encryption" ? string # false + "security.token.type" ? string # symmetric + "response.chunking" ? string # false + "response.chunksize" ? long # 0 + "currency.precision" ? long # 0 + "log4perl.logger" : string = 'TRACE, Log, Screen ' + "log4perl.appender.Log.Threshold" : string = 'INFO' + "log4perl.appender.Screen.Threshold" : string = 'FATAL' + "log4perl.logger.Message" ? string # TRACE, + "log4perl.appender.Log" ? string # Log::Log4perl::Appender::File + "log4perl.appender.Log" : string = 'Log::Dispatch::FileRotate' + "log4perl.appender.Log.filename" : string = '/usr/local/gold/log/goldg.log' + "log4perl.appender.Log.filename" ? string # sub + "log4perl.appender.Log.mode" : string = 'append' + "log4perl.appender.Log.size" : long = 10000000 + "log4perl.appender.Log.max" : long = 7 + "log4perl.appender.Log.layout" : string = 'PatternLayout' + "log4perl.appender.Log.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss} %-5p %M %m%n' + "log4perl.appender.Screen" : string = 'Log::Log4perl::Appender::Screen' + "log4perl.appender.Screen.layout" : string = 'PatternLayout' + "log4perl.appender.Screen.layout.ConversionPattern" : string = '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p %M [%F:%L] %m%n' +}; + +type gold_component = { + include structure_component + + 'configPath' : string = "/usr/local/gold/etc" + + ## the secret key + "auth_key" : string + + ## always configure client + "client" : gold_component_client + + "cgiclient" ? gold_component_cgiclient + + ## optional server configuration + "server" ? gold_component_server +}; + +bind '/software/components/gold' = gold_component; + + diff --git a/components/gpfs/config-common.pan b/components/gpfs/config-common.pan index 1c7b03638..e99f150e1 100644 --- a/components/gpfs/config-common.pan +++ b/components/gpfs/config-common.pan @@ -14,7 +14,7 @@ # # # - # gpfs, 13.9.0, 1, 20130911-1927 + # gpfs, 13.1.2, 1, 20131015-1106 # unique template components/gpfs/config-common; @@ -24,7 +24,7 @@ include { 'components/gpfs/schema' }; # Set prefix to root of component configuration. prefix '/software/components/gpfs'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/gpfs/config-rpm.pan b/components/gpfs/config-rpm.pan index 2e0f4fa85..76226112d 100644 --- a/components/gpfs/config-rpm.pan +++ b/components/gpfs/config-rpm.pan @@ -19,10 +19,10 @@ unique template components/gpfs/config-rpm; include { 'components/gpfs/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-gpfs", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-gpfs", "13.1.2-1", "noarch"); -'/software/components/gpfs/version' ?= '13.9.0'; +'/software/components/gpfs/version' ?= '13.1.2'; "/software/components/gpfs/dependencies/pre" ?= list("spma"); "/software/components/gpfs/active" ?= true; diff --git a/components/gpfs/config-xml.pan b/components/gpfs/config-xml.pan index a6800b842..38edf899a 100644 --- a/components/gpfs/config-xml.pan +++ b/components/gpfs/config-xml.pan @@ -14,7 +14,7 @@ # # # - # gpfs, 13.9.0, 1, 20130911-1927 + # gpfs, 13.1.2, 1, 20131015-1106 # unique template components/gpfs/config-xml; diff --git a/components/gpfs/config.pan b/components/gpfs/config.pan index a5f3a69fc..fd5603ab1 100644 --- a/components/gpfs/config.pan +++ b/components/gpfs/config.pan @@ -14,7 +14,7 @@ # # # - # gpfs, 13.9.0, 1, 20130911-1927 + # gpfs, 13.1.2, 1, 20131015-1106 # unique template components/gpfs/config; diff --git a/components/gridmapdir/config-common.pan b/components/gridmapdir/config-common.pan new file mode 100644 index 000000000..fb153ef9a --- /dev/null +++ b/components/gridmapdir/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gridmapdir, 13.1.2, 1, 20131015-1127 + # + +unique template components/gridmapdir/config-common; + +include { 'components/gridmapdir/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gridmapdir'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/gridmapdir/config-rpm.pan b/components/gridmapdir/config-rpm.pan new file mode 100644 index 000000000..da7e113f9 --- /dev/null +++ b/components/gridmapdir/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gridmapdir, 13.1.2, 1, 20131015-1127 + # + +unique template components/gridmapdir/config-rpm; + +include { 'components/gridmapdir/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gridmapdir'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-gridmapdir','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/gridmapdir/config-xml.pan b/components/gridmapdir/config-xml.pan new file mode 100644 index 000000000..6b1b21f79 --- /dev/null +++ b/components/gridmapdir/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gridmapdir, 13.1.2, 1, 20131015-1127 + # + +unique template components/gridmapdir/config-xml; + +include { 'components/gridmapdir/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gridmapdir'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/gridmapdir/gridmapdir.pm'); diff --git a/components/gridmapdir/config.pan b/components/gridmapdir/config.pan new file mode 100644 index 000000000..1c2097012 --- /dev/null +++ b/components/gridmapdir/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gridmapdir, 13.1.2, 1, 20131015-1127 + # + +unique template components/gridmapdir/config; + +include { 'components/gridmapdir/config-rpm' }; diff --git a/components/gridmapdir/schema.pan b/components/gridmapdir/schema.pan new file mode 100644 index 000000000..ac5abdda3 --- /dev/null +++ b/components/gridmapdir/schema.pan @@ -0,0 +1,35 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gridmapdir, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/gridmapdir/schema; + +include { 'quattor/schema' }; + +type gridmapdir_component = { + include structure_component + 'gridmapdir' : string + 'poolaccounts' : long(0..0){} + 'sharedGridmapdir' ? string + 'owner' : string = 'root' + 'group' : string = 'root' + 'perms' : string = '0755' +}; + +bind '/software/components/gridmapdir' = gridmapdir_component; diff --git a/components/grub/config-common.pan b/components/grub/config-common.pan index 550dc0a75..8b1c04f33 100644 --- a/components/grub/config-common.pan +++ b/components/grub/config-common.pan @@ -14,7 +14,7 @@ # # # - # grub, 13.9.0, 1, 20130911-1927 + # grub, 13.1.2, 1, 20131015-1106 # unique template components/grub/config-common; @@ -24,7 +24,7 @@ include { 'components/grub/schema' }; # Set prefix to root of component configuration. prefix '/software/components/grub'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/grub/config-rpm.pan b/components/grub/config-rpm.pan index 119db6d4f..80cc0ae2e 100644 --- a/components/grub/config-rpm.pan +++ b/components/grub/config-rpm.pan @@ -22,7 +22,7 @@ include {'components/grub/schema'}; include {'pan/functions'}; # Package to install. -"/software/packages" = pkg_repl("ncm-grub", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-grub", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/grub/config-xml.pan b/components/grub/config-xml.pan index bf951c1f1..13b93f1d0 100644 --- a/components/grub/config-xml.pan +++ b/components/grub/config-xml.pan @@ -14,7 +14,7 @@ # # # - # grub, 13.9.0, 1, 20130911-1927 + # grub, 13.1.2, 1, 20131015-1106 # unique template components/grub/config-xml; diff --git a/components/grub/config.pan b/components/grub/config.pan index a46436e60..89b85bba7 100644 --- a/components/grub/config.pan +++ b/components/grub/config.pan @@ -14,7 +14,7 @@ # # # - # grub, 13.9.0, 1, 20130911-1927 + # grub, 13.1.2, 1, 20131015-1106 # unique template components/grub/config; diff --git a/components/gsissh/config-common.pan b/components/gsissh/config-common.pan new file mode 100644 index 000000000..fbd447563 --- /dev/null +++ b/components/gsissh/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gsissh, 13.1.2, 1, 20131015-1127 + # + +unique template components/gsissh/config-common; + +include { 'components/gsissh/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gsissh'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/gsissh/config-rpm.pan b/components/gsissh/config-rpm.pan new file mode 100644 index 000000000..17f7ca678 --- /dev/null +++ b/components/gsissh/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gsissh, 13.1.2, 1, 20131015-1127 + # + +unique template components/gsissh/config-rpm; + +include { 'components/gsissh/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gsissh'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-gsissh','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/gsissh/config-xml.pan b/components/gsissh/config-xml.pan new file mode 100644 index 000000000..006cea9de --- /dev/null +++ b/components/gsissh/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gsissh, 13.1.2, 1, 20131015-1127 + # + +unique template components/gsissh/config-xml; + +include { 'components/gsissh/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/gsissh'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/gsissh/gsissh.pm'); diff --git a/components/gsissh/config.pan b/components/gsissh/config.pan new file mode 100644 index 000000000..fc7d14663 --- /dev/null +++ b/components/gsissh/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gsissh, 13.1.2, 1, 20131015-1127 + # + +unique template components/gsissh/config; + +include { 'components/gsissh/config-rpm' }; diff --git a/components/gsissh/schema.pan b/components/gsissh/schema.pan new file mode 100644 index 000000000..f0a267d50 --- /dev/null +++ b/components/gsissh/schema.pan @@ -0,0 +1,44 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # gsissh, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/gsissh/schema; + +include { 'quattor/schema' }; +include { 'pan/types' }; + +type structure_gsissh_server = { + 'port' : type_port + 'options' ? string{} +}; + +type structure_gsissh_client = { + 'options' ? string{} +}; + +type gsissh_component = { + include structure_component + 'globus_location' ? string + 'gpt_location' ? string + 'server' ? structure_gsissh_server + 'client' ? structure_gsissh_client +}; + +bind '/software/components/gsissh' = gsissh_component; + diff --git a/components/hostsaccess/config-common.pan b/components/hostsaccess/config-common.pan index d20f80279..844a44ccd 100644 --- a/components/hostsaccess/config-common.pan +++ b/components/hostsaccess/config-common.pan @@ -14,7 +14,7 @@ # # # - # hostsaccess, 13.9.0, 1, 20130911-1927 + # hostsaccess, 13.1.2, 1, 20131015-1106 # unique template components/hostsaccess/config-common; @@ -24,7 +24,7 @@ include { 'components/hostsaccess/schema' }; # Set prefix to root of component configuration. prefix '/software/components/hostsaccess'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/hostsaccess/config-rpm.pan b/components/hostsaccess/config-rpm.pan index 74e767f6b..edf9ea3d5 100644 --- a/components/hostsaccess/config-rpm.pan +++ b/components/hostsaccess/config-rpm.pan @@ -19,8 +19,8 @@ unique template components/hostsaccess/config-rpm; include {'components/hostsaccess/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-hostsaccess", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-hostsaccess", "13.1.2-1", "noarch"); '/software/components/hostsaccess/dependencies/pre' ?= list('spma'); -'/software/components/hostsaccess/version' = '13.9.0'; +'/software/components/hostsaccess/version' = '13.1.2'; diff --git a/components/hostsaccess/config-xml.pan b/components/hostsaccess/config-xml.pan index 8faf155c9..877543970 100644 --- a/components/hostsaccess/config-xml.pan +++ b/components/hostsaccess/config-xml.pan @@ -14,7 +14,7 @@ # # # - # hostsaccess, 13.9.0, 1, 20130911-1927 + # hostsaccess, 13.1.2, 1, 20131015-1106 # unique template components/hostsaccess/config-xml; diff --git a/components/hostsaccess/config.pan b/components/hostsaccess/config.pan index 5d22e6add..500be8670 100644 --- a/components/hostsaccess/config.pan +++ b/components/hostsaccess/config.pan @@ -14,7 +14,7 @@ # # # - # hostsaccess, 13.9.0, 1, 20130911-1927 + # hostsaccess, 13.1.2, 1, 20131015-1106 # unique template components/hostsaccess/config; diff --git a/components/hostsfile/config-common.pan b/components/hostsfile/config-common.pan index 91752abec..79cf3f486 100644 --- a/components/hostsfile/config-common.pan +++ b/components/hostsfile/config-common.pan @@ -14,7 +14,7 @@ # # # - # hostsfile, 13.9.0, 1, 20130911-1927 + # hostsfile, 13.1.2, 1, 20131015-1106 # unique template components/hostsfile/config-common; @@ -24,7 +24,7 @@ include { 'components/hostsfile/schema' }; # Set prefix to root of component configuration. prefix '/software/components/hostsfile'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/hostsfile/config-rpm.pan b/components/hostsfile/config-rpm.pan index d86f36151..63ee09e91 100644 --- a/components/hostsfile/config-rpm.pan +++ b/components/hostsfile/config-rpm.pan @@ -22,6 +22,6 @@ include { 'components/hostsfile/schema' }; "/software/components/hostsfile/dispatch" ?= false; # Package to install -"/software/packages" = pkg_repl("ncm-hostsfile", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-hostsfile", "13.1.2-1", "noarch"); -'/software/components/hostsfile/version' = '13.9.0'; +'/software/components/hostsfile/version' = '13.1.2'; diff --git a/components/hostsfile/config-xml.pan b/components/hostsfile/config-xml.pan index 7861e833b..ec5184af4 100644 --- a/components/hostsfile/config-xml.pan +++ b/components/hostsfile/config-xml.pan @@ -14,7 +14,7 @@ # # # - # hostsfile, 13.9.0, 1, 20130911-1927 + # hostsfile, 13.1.2, 1, 20131015-1106 # unique template components/hostsfile/config-xml; diff --git a/components/hostsfile/config.pan b/components/hostsfile/config.pan index 2b052459e..9d8c0ae3e 100644 --- a/components/hostsfile/config.pan +++ b/components/hostsfile/config.pan @@ -14,7 +14,7 @@ # # # - # hostsfile, 13.9.0, 1, 20130911-1927 + # hostsfile, 13.1.2, 1, 20131015-1106 # unique template components/hostsfile/config; diff --git a/components/icinga/config-common.pan b/components/icinga/config-common.pan index 04c2aeb8b..d3e955be0 100644 --- a/components/icinga/config-common.pan +++ b/components/icinga/config-common.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # unique template components/icinga/config-common; @@ -24,7 +24,7 @@ include { 'components/icinga/schema' }; # Set prefix to root of component configuration. prefix '/software/components/icinga'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/icinga/config-rpm.pan b/components/icinga/config-rpm.pan index 554d14c4b..d115a5c35 100644 --- a/components/icinga/config-rpm.pan +++ b/components/icinga/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # unique template components/icinga/config-rpm; @@ -22,7 +22,7 @@ include {'components/icinga/functions'}; include {'components/icinga/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-icinga", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-icinga", "13.1.2-1", "noarch"); "/software/components/icinga/dependencies/pre" ?= list ("spma"); diff --git a/components/icinga/config-xml.pan b/components/icinga/config-xml.pan index 66e6084c4..ee4ff58e6 100644 --- a/components/icinga/config-xml.pan +++ b/components/icinga/config-xml.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # unique template components/icinga/config-xml; diff --git a/components/icinga/config.pan b/components/icinga/config.pan index ffc7e9f64..2ad590dea 100644 --- a/components/icinga/config.pan +++ b/components/icinga/config.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # unique template components/icinga/config; diff --git a/components/icinga/functions.pan b/components/icinga/functions.pan index bd1fa58e8..ce95d05b3 100644 --- a/components/icinga/functions.pan +++ b/components/icinga/functions.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # template components/icinga/functions; diff --git a/components/icinga/schema.pan b/components/icinga/schema.pan index 1e07f7bee..873bd14c7 100644 --- a/components/icinga/schema.pan +++ b/components/icinga/schema.pan @@ -14,7 +14,7 @@ # # # - # icinga, 13.9.0, 1, 20130911-1927 + # icinga, 13.1.2, 1, 20131015-1106 # declaration template components/icinga/schema; diff --git a/components/interactivelimits/config-common.pan b/components/interactivelimits/config-common.pan index 61b074126..ce612e4ef 100644 --- a/components/interactivelimits/config-common.pan +++ b/components/interactivelimits/config-common.pan @@ -14,7 +14,7 @@ # # # - # interactivelimits, 13.9.0, 1, 20130911-1927 + # interactivelimits, 13.1.2, 1, 20131015-1106 # unique template components/interactivelimits/config-common; @@ -24,7 +24,7 @@ include { 'components/interactivelimits/schema' }; # Set prefix to root of component configuration. prefix '/software/components/interactivelimits'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/interactivelimits/config-rpm.pan b/components/interactivelimits/config-rpm.pan index 9011b0559..1eddc19e5 100644 --- a/components/interactivelimits/config-rpm.pan +++ b/components/interactivelimits/config-rpm.pan @@ -21,7 +21,7 @@ include { 'components/interactivelimits/schema' }; include { 'pan/functions' }; # Package to install. -"/software/packages" = pkg_repl("ncm-interactivelimits", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-interactivelimits", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/interactivelimits/config-xml.pan b/components/interactivelimits/config-xml.pan index 4ffa0c81c..bd25a4a10 100644 --- a/components/interactivelimits/config-xml.pan +++ b/components/interactivelimits/config-xml.pan @@ -14,7 +14,7 @@ # # # - # interactivelimits, 13.9.0, 1, 20130911-1927 + # interactivelimits, 13.1.2, 1, 20131015-1106 # unique template components/interactivelimits/config-xml; diff --git a/components/interactivelimits/config.pan b/components/interactivelimits/config.pan index c56e702e7..8f39d64e0 100644 --- a/components/interactivelimits/config.pan +++ b/components/interactivelimits/config.pan @@ -14,7 +14,7 @@ # # # - # interactivelimits, 13.9.0, 1, 20130911-1927 + # interactivelimits, 13.1.2, 1, 20131015-1106 # unique template components/interactivelimits/config; diff --git a/components/ipmi/config-common.pan b/components/ipmi/config-common.pan index 8c55da219..5dc2dd9ec 100644 --- a/components/ipmi/config-common.pan +++ b/components/ipmi/config-common.pan @@ -11,7 +11,7 @@ # # # - # ipmi, 13.9.0, 1, 20130911-1927 + # ipmi, 13.1.2, 1, 20131015-1106 # unique template components/ipmi/config-common; @@ -21,7 +21,7 @@ include { 'components/ipmi/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ipmi'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ipmi/config-rpm.pan b/components/ipmi/config-rpm.pan index a2bc1ef23..b0c1efa59 100644 --- a/components/ipmi/config-rpm.pan +++ b/components/ipmi/config-rpm.pan @@ -17,10 +17,10 @@ unique template components/ipmi/config-rpm; include { 'components/ipmi/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-ipmi", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ipmi", "13.1.2-1", "noarch"); -'/software/components/ipmi/version' = '13.9.0'; +'/software/components/ipmi/version' = '13.1.2'; "/software/components/ipmi/dependencies/post" ?= list("spma"); "/software/components/ipmi/active" ?= true; diff --git a/components/ipmi/config-xml.pan b/components/ipmi/config-xml.pan index 02700dd14..49be504e9 100644 --- a/components/ipmi/config-xml.pan +++ b/components/ipmi/config-xml.pan @@ -11,7 +11,7 @@ # # # - # ipmi, 13.9.0, 1, 20130911-1927 + # ipmi, 13.1.2, 1, 20131015-1106 # unique template components/ipmi/config-xml; diff --git a/components/ipmi/config.pan b/components/ipmi/config.pan index 968685884..b36652057 100644 --- a/components/ipmi/config.pan +++ b/components/ipmi/config.pan @@ -11,7 +11,7 @@ # # # - # ipmi, 13.9.0, 1, 20130911-1927 + # ipmi, 13.1.2, 1, 20131015-1106 # unique template components/ipmi/config; diff --git a/components/iptables/config-common.pan b/components/iptables/config-common.pan index 699f58fc9..aa41b8671 100644 --- a/components/iptables/config-common.pan +++ b/components/iptables/config-common.pan @@ -14,7 +14,7 @@ # # # - # iptables, 13.9.0, 1, 20130911-1927 + # iptables, 13.1.2, 1, 20131015-1106 # unique template components/iptables/config-common; @@ -24,7 +24,7 @@ include { 'components/iptables/schema' }; # Set prefix to root of component configuration. prefix '/software/components/iptables'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/iptables/config-rpm.pan b/components/iptables/config-rpm.pan index f5891b97f..7ccb61c68 100644 --- a/components/iptables/config-rpm.pan +++ b/components/iptables/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/iptables/config-rpm; include { "components/iptables/schema" }; # Package to install. -"/software/packages" = pkg_repl("ncm-iptables", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-iptables", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/iptables/config-xml.pan b/components/iptables/config-xml.pan index b82897983..a111956b1 100644 --- a/components/iptables/config-xml.pan +++ b/components/iptables/config-xml.pan @@ -14,7 +14,7 @@ # # # - # iptables, 13.9.0, 1, 20130911-1927 + # iptables, 13.1.2, 1, 20131015-1106 # unique template components/iptables/config-xml; diff --git a/components/iptables/config.pan b/components/iptables/config.pan index 5ec72a6e0..985a0f7ce 100644 --- a/components/iptables/config.pan +++ b/components/iptables/config.pan @@ -14,7 +14,7 @@ # # # - # iptables, 13.9.0, 1, 20130911-1927 + # iptables, 13.1.2, 1, 20131015-1106 # unique template components/iptables/config; diff --git a/components/iscsitarget/config-common.pan b/components/iscsitarget/config-common.pan index 591cf5ec5..1c028cccb 100644 --- a/components/iscsitarget/config-common.pan +++ b/components/iscsitarget/config-common.pan @@ -14,7 +14,7 @@ # # # - # iscsitarget, 13.9.0, 1, 20130911-1927 + # iscsitarget, 13.1.2, 1, 20131015-1106 # unique template components/iscsitarget/config-common; @@ -24,7 +24,7 @@ include { 'components/iscsitarget/schema' }; # Set prefix to root of component configuration. prefix '/software/components/iscsitarget'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/iscsitarget/config-rpm.pan b/components/iscsitarget/config-rpm.pan index a2c54d437..9418d74f5 100644 --- a/components/iscsitarget/config-rpm.pan +++ b/components/iscsitarget/config-rpm.pan @@ -21,4 +21,4 @@ include {'components/iscsitarget/schema'}; "/software/components/iscsitarget/active" ?= true; -"/software/packages" = pkg_repl("ncm-iscsitarget", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-iscsitarget", "13.1.2-1", "noarch"); diff --git a/components/iscsitarget/config-xml.pan b/components/iscsitarget/config-xml.pan index bfee29fb5..045c41e38 100644 --- a/components/iscsitarget/config-xml.pan +++ b/components/iscsitarget/config-xml.pan @@ -14,7 +14,7 @@ # # # - # iscsitarget, 13.9.0, 1, 20130911-1927 + # iscsitarget, 13.1.2, 1, 20131015-1106 # unique template components/iscsitarget/config-xml; diff --git a/components/iscsitarget/config.pan b/components/iscsitarget/config.pan index 6107196cc..c315d6eb9 100644 --- a/components/iscsitarget/config.pan +++ b/components/iscsitarget/config.pan @@ -14,7 +14,7 @@ # # # - # iscsitarget, 13.9.0, 1, 20130911-1927 + # iscsitarget, 13.1.2, 1, 20131015-1106 # unique template components/iscsitarget/config; diff --git a/components/krb5clt/config-common.pan b/components/krb5clt/config-common.pan index 553434499..0e08ed089 100644 --- a/components/krb5clt/config-common.pan +++ b/components/krb5clt/config-common.pan @@ -14,7 +14,7 @@ # # # - # krb5clt, 13.9.0, 1, 20130911-1927 + # krb5clt, 13.1.2, 1, 20131015-1106 # unique template components/krb5clt/config-common; @@ -24,7 +24,7 @@ include { 'components/krb5clt/schema' }; # Set prefix to root of component configuration. prefix '/software/components/krb5clt'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/krb5clt/config-rpm.pan b/components/krb5clt/config-rpm.pan index 67f9088eb..e2384a099 100644 --- a/components/krb5clt/config-rpm.pan +++ b/components/krb5clt/config-rpm.pan @@ -21,7 +21,7 @@ unique template components/krb5clt/config-rpm; include {'components/krb5clt/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-krb5clt", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-krb5clt", "13.1.2-1", "noarch"); "/software/components/krb5clt/dependencies/pre" ?= list("spma"); diff --git a/components/krb5clt/config-xml.pan b/components/krb5clt/config-xml.pan index 5c181f1fe..06b2616bf 100644 --- a/components/krb5clt/config-xml.pan +++ b/components/krb5clt/config-xml.pan @@ -14,7 +14,7 @@ # # # - # krb5clt, 13.9.0, 1, 20130911-1927 + # krb5clt, 13.1.2, 1, 20131015-1106 # unique template components/krb5clt/config-xml; diff --git a/components/krb5clt/config.pan b/components/krb5clt/config.pan index 1b40fc805..4132ffd28 100644 --- a/components/krb5clt/config.pan +++ b/components/krb5clt/config.pan @@ -14,7 +14,7 @@ # # # - # krb5clt, 13.9.0, 1, 20130911-1927 + # krb5clt, 13.1.2, 1, 20131015-1106 # unique template components/krb5clt/config; diff --git a/components/lbconfig/config-common.pan b/components/lbconfig/config-common.pan new file mode 100644 index 000000000..652300745 --- /dev/null +++ b/components/lbconfig/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lbconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/lbconfig/config-common; + +include { 'components/lbconfig/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lbconfig'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/lbconfig/config-rpm.pan b/components/lbconfig/config-rpm.pan new file mode 100644 index 000000000..92221b8b8 --- /dev/null +++ b/components/lbconfig/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lbconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/lbconfig/config-rpm; + +include { 'components/lbconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lbconfig'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-lbconfig','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/lbconfig/config-xml.pan b/components/lbconfig/config-xml.pan new file mode 100644 index 000000000..ab348e6e5 --- /dev/null +++ b/components/lbconfig/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lbconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/lbconfig/config-xml; + +include { 'components/lbconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lbconfig'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/lbconfig/lbconfig.pm'); diff --git a/components/lbconfig/config.pan b/components/lbconfig/config.pan new file mode 100644 index 000000000..7412e2a38 --- /dev/null +++ b/components/lbconfig/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lbconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/lbconfig/config; + +include { 'components/lbconfig/config-rpm' }; diff --git a/components/lbconfig/schema.pan b/components/lbconfig/schema.pan new file mode 100644 index 000000000..2428d9f54 --- /dev/null +++ b/components/lbconfig/schema.pan @@ -0,0 +1,33 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lbconfig, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/lbconfig/schema; + +include { 'quattor/schema' }; + +type structure_index_list = string[]; + +type lbconfig_component = { + include structure_component + 'configFile' : string = 'edg_wl_query_index.conf' + 'indicies' : structure_index_list{} = nlist('system', list('owner','location','destination')) +}; + +bind '/software/components/lbconfig' = lbconfig_component; diff --git a/components/lcas/config-common.pan b/components/lcas/config-common.pan new file mode 100644 index 000000000..a9a97e858 --- /dev/null +++ b/components/lcas/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcas, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcas/config-common; + +include { 'components/lcas/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcas'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/lcas/config-rpm.pan b/components/lcas/config-rpm.pan new file mode 100644 index 000000000..1b5bbe48f --- /dev/null +++ b/components/lcas/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcas, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcas/config-rpm; + +include { 'components/lcas/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcas'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-lcas','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/lcas/config-xml.pan b/components/lcas/config-xml.pan new file mode 100644 index 000000000..e29891b52 --- /dev/null +++ b/components/lcas/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcas, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcas/config-xml; + +include { 'components/lcas/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcas'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/lcas/lcas.pm'); diff --git a/components/lcas/config.pan b/components/lcas/config.pan new file mode 100644 index 000000000..b3436be10 --- /dev/null +++ b/components/lcas/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcas, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcas/config; + +include { 'components/lcas/config-rpm' }; diff --git a/components/lcas/schema.pan b/components/lcas/schema.pan new file mode 100644 index 000000000..518986ee7 --- /dev/null +++ b/components/lcas/schema.pan @@ -0,0 +1,73 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcas, 13.1.2, 1, 20131015-1127 + # +# +# Coding style: emulate characters with 4 spaces, thanks! +################################################################################ + + +declaration template components/lcas/schema; + +include { 'quattor/schema' }; + +# Validation function to ensure that legacy schema properties for describing +#databases ('dbpath', 'module') are not used with the new ones (under 'db'). +function component_lcas_valid = { + if ( (ARGC != 1) && !is_nlist(ARGV[0]) ) { + error('Invalid argument list in validation function component_lcas_valid'); + }; + + if ( is_defined(SELF['db']) && is_defined(SELF['dbpath']) ) { + error('Single database and multiple database configuration are mutually exclusive'); + return(false); + } else if ( !is_defined(SELF['db']) && !is_defined(SELF['dbpath']) ) { + error('Neither multiple database configuration nor valid single database configuration present'); + return(false); + }; + + return(true); +}; + + +type lcas_component_plainfile_content = { + "path" : string + "noheader" : boolean = false + "content" ? string[] +}; + +type lcas_component_modulespec = { + "path" : string + "args" ? string + "conf" ? lcas_component_plainfile_content +}; + +type lcas_component_db = { + "path" : string + "module" ? lcas_component_modulespec[] +}; + +type lcas_component = { + include structure_component + "db" ? lcas_component_db[] + # Deprecated: use 'db' instead. + "dbpath" ? string + "module" ? lcas_component_modulespec[] +} with component_lcas_valid(SELF); + +bind "/software/components/lcas" = lcas_component; + diff --git a/components/lcgbdii/config-common.pan b/components/lcgbdii/config-common.pan new file mode 100644 index 000000000..6b6c406ab --- /dev/null +++ b/components/lcgbdii/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgbdii, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgbdii/config-common; + +include { 'components/lcgbdii/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgbdii'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/lcgbdii/config-rpm.pan b/components/lcgbdii/config-rpm.pan new file mode 100644 index 000000000..e5b0cc49d --- /dev/null +++ b/components/lcgbdii/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgbdii, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgbdii/config-rpm; + +include { 'components/lcgbdii/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgbdii'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-lcgbdii','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/lcgbdii/config-xml.pan b/components/lcgbdii/config-xml.pan new file mode 100644 index 000000000..b6f376b7e --- /dev/null +++ b/components/lcgbdii/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgbdii, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgbdii/config-xml; + +include { 'components/lcgbdii/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgbdii'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/lcgbdii/lcgbdii.pm'); diff --git a/components/lcgbdii/config.pan b/components/lcgbdii/config.pan new file mode 100644 index 000000000..96fd3d49e --- /dev/null +++ b/components/lcgbdii/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgbdii, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgbdii/config; + +include { 'components/lcgbdii/config-rpm' }; diff --git a/components/lcgbdii/schema.pan b/components/lcgbdii/schema.pan new file mode 100644 index 000000000..af9150e57 --- /dev/null +++ b/components/lcgbdii/schema.pan @@ -0,0 +1,98 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgbdii, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/lcgbdii/schema; + +include { 'quattor/schema' }; + +include { 'pan/types' }; + +# Function to check that some optional properties are present in context they +# are requireed +function lcgbdii_check_params = { + if ( ARGC != 1 ) { + error('lcgbdii_check_params must receive exactly one argument of type component_lcgbdii'); + }; + + if ( is_defined(SELF['autoUpdate']) && (SELF['autoUpdate'] == 'yes') && !exists(SELF['updateUrl']) ) { + error('Property updateUrl required when autoUpdate=yes'); + }; + + if ( is_defined(SELF['autoModify']) && (SELF['autoModify'] == 'yes') && !exists(SELF['updateLdif']) ) { + error('Property updateLdif required when autoModify=yes'); + }; + + if ( !is_defined(SELF['port']) && (!is_defined(SELF['portRead']) || !is_defined(SELF['portsWrite'])) ) { + error('Either port or portRead/portsWrite must be specified'); + }; + + true; +}; + + +type lcgbdii_component = { + include structure_component + + 'dir' ? string = '/opt/bdii/' + 'varDir' : string = '/opt/bdii/var' + 'configFile' : string = '/opt/bdii/bdii.conf' + 'logFile' ? string + 'logLevel' : string = "ERROR" with match(SELF,'^(ERROR|WARNING|INFO|DEBUG)$') + + 'schemaFile' ? string = '/opt/bdii/etc/schemas' + 'schemas' ? string[] + + 'port' ? type_port + 'portRead' ? type_port + 'portsWrite' ? type_port[] + 'user' : string = 'edguser' + 'bind' ? string = 'mds-vo-name=local,o=grid' + 'passwd' ? string + 'searchFilter' ? string + 'searchTimeout' ? long(1..) + 'readTimeout' ? long(1..) + 'breatheTime' ? long(1..) = 60 + 'archiveSize' ? long + 'autoUpdate' ? string = 'no' with match (SELF, '^(yes|no)$') + 'autoModify' ? string = 'no' with match (SELF, '^(yes|no)$') + 'isCache' ? string = 'no' with match (SELF, '^(yes|no)$') + 'modifyDN' ? string = 'no' with match (SELF, '^(yes|no)$') + 'RAMDisk' ? string with match (SELF, '^(yes|no)$') + 'deleteDelay' ? long + 'fixGlue' ? string with match (SELF, '^(yes|no)$') + + 'updateUrl' ? type_absoluteURI + 'updateLdif' ? type_absoluteURI + 'defaultLdif' ? string = '/opt/bdii/etc/default.ldif' + + 'slapd' ? string + 'slapadd' ? string + 'slapdConf' ? string = '/opt/bdii/etc/glue-slapd.conf' + 'slapdDebugLevel' ? long(0..5) + + 'urls' ? type_absoluteURI{} + + 'ldifDir' ? string + 'pluginDir' ? string + 'providerDir' ? string + +} with lcgbdii_check_params(SELF); + +bind '/software/components/lcgbdii' = lcgbdii_component; diff --git a/components/lcgmonjob/config-common.pan b/components/lcgmonjob/config-common.pan new file mode 100644 index 000000000..d93a6dcd3 --- /dev/null +++ b/components/lcgmonjob/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgmonjob, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgmonjob/config-common; + +include { 'components/lcgmonjob/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgmonjob'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/lcgmonjob/config-rpm.pan b/components/lcgmonjob/config-rpm.pan new file mode 100644 index 000000000..0f4431c6a --- /dev/null +++ b/components/lcgmonjob/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgmonjob, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgmonjob/config-rpm; + +include { 'components/lcgmonjob/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgmonjob'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-lcgmonjob','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/lcgmonjob/config-xml.pan b/components/lcgmonjob/config-xml.pan new file mode 100644 index 000000000..780197da3 --- /dev/null +++ b/components/lcgmonjob/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgmonjob, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgmonjob/config-xml; + +include { 'components/lcgmonjob/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcgmonjob'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/lcgmonjob/lcgmonjob.pm'); diff --git a/components/lcgmonjob/config.pan b/components/lcgmonjob/config.pan new file mode 100644 index 000000000..aa9774dff --- /dev/null +++ b/components/lcgmonjob/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgmonjob, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcgmonjob/config; + +include { 'components/lcgmonjob/config-rpm' }; diff --git a/components/lcgmonjob/schema.pan b/components/lcgmonjob/schema.pan new file mode 100644 index 000000000..32e196d2a --- /dev/null +++ b/components/lcgmonjob/schema.pan @@ -0,0 +1,33 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcgmonjob, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/lcgmonjob/schema; + +include { 'quattor/schema' }; + +type lcgmonjob_component = { + include structure_component + 'EDG_LOCATION' : string + 'LCG_LOCATION' : string +}; + +bind '/software/components/lcgmonjob' = lcgmonjob_component; + + diff --git a/components/lcmaps/config-common.pan b/components/lcmaps/config-common.pan new file mode 100644 index 000000000..42e37f61b --- /dev/null +++ b/components/lcmaps/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcmaps, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcmaps/config-common; + +include { 'components/lcmaps/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcmaps'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/lcmaps/config-rpm.pan b/components/lcmaps/config-rpm.pan new file mode 100644 index 000000000..52f37f238 --- /dev/null +++ b/components/lcmaps/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcmaps, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcmaps/config-rpm; + +include { 'components/lcmaps/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcmaps'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-lcmaps','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/lcmaps/config-xml.pan b/components/lcmaps/config-xml.pan new file mode 100644 index 000000000..70b62a62f --- /dev/null +++ b/components/lcmaps/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcmaps, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcmaps/config-xml; + +include { 'components/lcmaps/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/lcmaps'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/lcmaps/lcmaps.pm'); diff --git a/components/lcmaps/config.pan b/components/lcmaps/config.pan new file mode 100644 index 000000000..efaf29266 --- /dev/null +++ b/components/lcmaps/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcmaps, 13.1.2, 1, 20131015-1127 + # + +unique template components/lcmaps/config; + +include { 'components/lcmaps/config-rpm' }; diff --git a/components/lcmaps/schema.pan b/components/lcmaps/schema.pan new file mode 100644 index 000000000..c195ddd4e --- /dev/null +++ b/components/lcmaps/schema.pan @@ -0,0 +1,82 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # lcmaps, 13.1.2, 1, 20131015-1127 + # +# +# Coding style: emulate characters with 4 spaces, thanks! +################################################################################ + + +declaration template components/lcmaps/schema; + +include { 'quattor/schema' }; + +function component_lcmaps_valid = { + if ( (ARGC != 1) && !is_nlist(ARGV[0]) ) { + error('Invalid argument list in validation function component_lcmaps_valid'); + }; + + if ( exists(SELF['config']) && is_defined(SELF['config']) && + exists(SELF['dbpath']) && is_defined(SELF['dbpath']) && + exists(SELF['module']) && is_defined(SELF['module']) && + exists(SELF['modulepath']) && is_defined(SELF['modulepath']) && + exists(SELF['policies']) && is_defined(SELF['policies']) ) { + error('Single file and multifile configuration be used togheter'); + return(false); + } else if ( !exists(SELF['config']) || !is_defined(SELF['config']) ) { + if ( !exists(SELF['dbpath']) || !is_defined(SELF['dbpath']) || + !exists(SELF['modulepath']) || !is_defined(SELF['modulepath']) ) { + error('Neiter multifile configuration nor valid single file configuration present'); + return(false); + }; + }; + + return(true); +}; + +type lcmaps_modulespec_type = { + "path" : string + "args" ? string +}; + +type lcmaps_policy_type = { + "name" : string + "ruleset" : string[] +}; + +type lcmaps_file_type = { + "dbpath" : string + "modulepath" : string + "module" ? lcmaps_modulespec_type{} + "policies" ? lcmaps_policy_type[] +}; + +type lcmaps_component = { + include structure_component + "flavor" ? string with match(SELF,'edg|glite') + "dbpath" ? string + "modulepath" ? string + "multifile" ? boolean + "module" ? lcmaps_modulespec_type{} + "policies" ? lcmaps_policy_type[] + "config" ? lcmaps_file_type[] + # 'multifile' is deprecated and ignored. Kept for backward compatibility. + "multifile" ? boolean +} with component_lcmaps_valid(SELF); + +bind "/software/components/lcmaps" = lcmaps_component; + diff --git a/components/ldconf/config-common.pan b/components/ldconf/config-common.pan index e0009534d..bc50b721e 100644 --- a/components/ldconf/config-common.pan +++ b/components/ldconf/config-common.pan @@ -14,7 +14,7 @@ # # # - # ldconf, 13.9.0, 1, 20130911-1927 + # ldconf, 13.1.2, 1, 20131015-1106 # unique template components/ldconf/config-common; @@ -24,7 +24,7 @@ include { 'components/ldconf/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ldconf'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ldconf/config-rpm.pan b/components/ldconf/config-rpm.pan index b73254b31..8276a9a0e 100644 --- a/components/ldconf/config-rpm.pan +++ b/components/ldconf/config-rpm.pan @@ -19,8 +19,8 @@ unique template components/ldconf/config-rpm; include {'components/ldconf/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-ldconf", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ldconf", "13.1.2-1", "noarch"); '/software/components/ldconf/dependencies/pre' ?= list('spma'); -'/software/components/ldconf/version' = '13.9.0'; +'/software/components/ldconf/version' = '13.1.2'; diff --git a/components/ldconf/config-xml.pan b/components/ldconf/config-xml.pan index 1191c2026..8ba932e21 100644 --- a/components/ldconf/config-xml.pan +++ b/components/ldconf/config-xml.pan @@ -14,7 +14,7 @@ # # # - # ldconf, 13.9.0, 1, 20130911-1927 + # ldconf, 13.1.2, 1, 20131015-1106 # unique template components/ldconf/config-xml; diff --git a/components/ldconf/config.pan b/components/ldconf/config.pan index 69a115cc3..a003da803 100644 --- a/components/ldconf/config.pan +++ b/components/ldconf/config.pan @@ -14,7 +14,7 @@ # # # - # ldconf, 13.9.0, 1, 20130911-1927 + # ldconf, 13.1.2, 1, 20131015-1106 # unique template components/ldconf/config; diff --git a/components/libvirtd/config.tpl b/components/libvirtd/config.pan similarity index 83% rename from components/libvirtd/config.tpl rename to components/libvirtd/config.pan index abae40fd2..be3ac5f05 100644 --- a/components/libvirtd/config.tpl +++ b/components/libvirtd/config.pan @@ -11,14 +11,14 @@ # # # - # libvirtd, 13.9.0, 1, 20130911-1927 + # libvirtd, 13.1.2, 1, 20131015-1106 # unique template components/libvirtd/config; include {'components/libvirtd/schema'}; -'/software/packages'=pkg_repl('ncm-libvirtd','13.9.0-1','noarch'); +'/software/packages'=pkg_repl('ncm-libvirtd','13.1.2-1','noarch'); '/software/components/libvirtd/dependencies/pre' ?= list ('spma'); '/software/components/libvirtd/active' ?= true; diff --git a/components/libvirtd/schema.tpl b/components/libvirtd/schema.pan similarity index 98% rename from components/libvirtd/schema.tpl rename to components/libvirtd/schema.pan index c75ad9a1f..261887c90 100644 --- a/components/libvirtd/schema.tpl +++ b/components/libvirtd/schema.pan @@ -11,7 +11,7 @@ # # # - # libvirtd, 13.9.0, 1, 20130911-1927 + # libvirtd, 13.1.2, 1, 20131015-1106 # declaration template components/libvirtd/schema; diff --git a/components/linuxha/config-common.pan b/components/linuxha/config-common.pan index 64ab20fcb..5d6f8ca23 100644 --- a/components/linuxha/config-common.pan +++ b/components/linuxha/config-common.pan @@ -14,7 +14,7 @@ # # # - # linuxha, 13.9.0, 1, 20130911-1927 + # linuxha, 13.1.2, 1, 20131015-1106 # unique template components/linuxha/config-common; @@ -24,7 +24,7 @@ include { 'components/linuxha/schema' }; # Set prefix to root of component configuration. prefix '/software/components/linuxha'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/linuxha/config-rpm.pan b/components/linuxha/config-rpm.pan index 08b80aa00..bb5af3e82 100644 --- a/components/linuxha/config-rpm.pan +++ b/components/linuxha/config-rpm.pan @@ -26,7 +26,7 @@ unique template components/linuxha/config-rpm; include {'components/linuxha/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-linuxha", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-linuxha", "13.1.2-1", "noarch"); "/software/components/linuxha/dependencies/pre" ?= list("spma"); diff --git a/components/linuxha/config-xml.pan b/components/linuxha/config-xml.pan index f31ad5175..3497987d6 100644 --- a/components/linuxha/config-xml.pan +++ b/components/linuxha/config-xml.pan @@ -14,7 +14,7 @@ # # # - # linuxha, 13.9.0, 1, 20130911-1927 + # linuxha, 13.1.2, 1, 20131015-1106 # unique template components/linuxha/config-xml; diff --git a/components/linuxha/config.pan b/components/linuxha/config.pan index 963d0bc35..1a38cfbc7 100644 --- a/components/linuxha/config.pan +++ b/components/linuxha/config.pan @@ -14,7 +14,7 @@ # # # - # linuxha, 13.9.0, 1, 20130911-1927 + # linuxha, 13.1.2, 1, 20131015-1106 # unique template components/linuxha/config; diff --git a/components/mailaliases/config-common.pan b/components/mailaliases/config-common.pan index 2e12906ad..d89e13182 100644 --- a/components/mailaliases/config-common.pan +++ b/components/mailaliases/config-common.pan @@ -14,7 +14,7 @@ # # # - # mailaliases, 13.9.0, 1, 20130911-1927 + # mailaliases, 13.1.2, 1, 20131015-1106 # unique template components/mailaliases/config-common; @@ -24,7 +24,7 @@ include { 'components/mailaliases/schema' }; # Set prefix to root of component configuration. prefix '/software/components/mailaliases'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/mailaliases/config-rpm.pan b/components/mailaliases/config-rpm.pan index 0a5368034..61e00188b 100644 --- a/components/mailaliases/config-rpm.pan +++ b/components/mailaliases/config-rpm.pan @@ -20,7 +20,7 @@ unique template components/mailaliases/config-rpm; include {'components/mailaliases/schema'}; # Package to install. -"/software/packages" = pkg_repl("ncm-mailaliases", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-mailaliases", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/mailaliases/config-xml.pan b/components/mailaliases/config-xml.pan index 55ba83870..7db3696ff 100644 --- a/components/mailaliases/config-xml.pan +++ b/components/mailaliases/config-xml.pan @@ -14,7 +14,7 @@ # # # - # mailaliases, 13.9.0, 1, 20130911-1927 + # mailaliases, 13.1.2, 1, 20131015-1106 # unique template components/mailaliases/config-xml; diff --git a/components/mailaliases/config.pan b/components/mailaliases/config.pan index 41410afb6..beaead63a 100644 --- a/components/mailaliases/config.pan +++ b/components/mailaliases/config.pan @@ -14,7 +14,7 @@ # # # - # mailaliases, 13.9.0, 1, 20130911-1927 + # mailaliases, 13.1.2, 1, 20131015-1106 # unique template components/mailaliases/config; diff --git a/components/maui/config-common.pan b/components/maui/config-common.pan new file mode 100644 index 000000000..f5038bef9 --- /dev/null +++ b/components/maui/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # maui, 13.1.2, 1, 20131015-1127 + # + +unique template components/maui/config-common; + +include { 'components/maui/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/maui'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/maui/config-rpm.pan b/components/maui/config-rpm.pan new file mode 100644 index 000000000..fc45a7898 --- /dev/null +++ b/components/maui/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # maui, 13.1.2, 1, 20131015-1127 + # + +unique template components/maui/config-rpm; + +include { 'components/maui/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/maui'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-maui','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/maui/config-xml.pan b/components/maui/config-xml.pan new file mode 100644 index 000000000..60649cd4f --- /dev/null +++ b/components/maui/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # maui, 13.1.2, 1, 20131015-1127 + # + +unique template components/maui/config-xml; + +include { 'components/maui/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/maui'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/maui/maui.pm'); diff --git a/components/maui/config.pan b/components/maui/config.pan new file mode 100644 index 000000000..4a60e0292 --- /dev/null +++ b/components/maui/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # maui, 13.1.2, 1, 20131015-1127 + # + +unique template components/maui/config; + +include { 'components/maui/config-rpm' }; diff --git a/components/maui/schema.pan b/components/maui/schema.pan new file mode 100644 index 000000000..44f027b77 --- /dev/null +++ b/components/maui/schema.pan @@ -0,0 +1,34 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # maui, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/maui/schema; + +include { 'quattor/schema' }; + +type maui_component = { + include structure_component + 'configPath' ? string + 'configFile' ? string + 'contents' ? string +}; + +bind '/software/components/maui' = maui_component; + + diff --git a/components/mcx/config-common.pan b/components/mcx/config-common.pan index 60fe7982d..0b2b30e38 100644 --- a/components/mcx/config-common.pan +++ b/components/mcx/config-common.pan @@ -14,7 +14,7 @@ # # # - # mcx, 13.9.0, 1, 20130911-1927 + # mcx, 13.1.2, 1, 20131015-1106 # unique template components/mcx/config-common; @@ -24,7 +24,7 @@ include { 'components/mcx/schema' }; # Set prefix to root of component configuration. prefix '/software/components/mcx'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/mcx/config-rpm.pan b/components/mcx/config-rpm.pan index bd3e9fc18..d1949607d 100644 --- a/components/mcx/config-rpm.pan +++ b/components/mcx/config-rpm.pan @@ -27,7 +27,7 @@ unique template components/mcx/config-rpm; include { 'components/mcx/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-mcx", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-mcx", "13.1.2-1", "noarch"); "/software/components/mcx/dependencies/pre" ?= list("directoryservices"); diff --git a/components/mcx/config-xml.pan b/components/mcx/config-xml.pan index 1a8094a05..d05e503c5 100644 --- a/components/mcx/config-xml.pan +++ b/components/mcx/config-xml.pan @@ -14,7 +14,7 @@ # # # - # mcx, 13.9.0, 1, 20130911-1927 + # mcx, 13.1.2, 1, 20131015-1106 # unique template components/mcx/config-xml; diff --git a/components/mcx/config.pan b/components/mcx/config.pan index 2d5196a40..374ccde93 100644 --- a/components/mcx/config.pan +++ b/components/mcx/config.pan @@ -14,7 +14,7 @@ # # # - # mcx, 13.9.0, 1, 20130911-1927 + # mcx, 13.1.2, 1, 20131015-1106 # unique template components/mcx/config; diff --git a/components/metaconfig/config-common.pan b/components/metaconfig/config-common.pan index 4637bc5e7..a2523f891 100644 --- a/components/metaconfig/config-common.pan +++ b/components/metaconfig/config-common.pan @@ -14,7 +14,7 @@ # # # - # metaconfig, 13.9.0, 1, 20130911-1927 + # metaconfig, 13.1.2, 1, 20131015-1106 # unique template components/metaconfig/config-common; @@ -24,7 +24,7 @@ include { 'components/metaconfig/schema' }; # Set prefix to root of component configuration. prefix '/software/components/metaconfig'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/metaconfig/config-rpm.pan b/components/metaconfig/config-rpm.pan index 2f15914be..f503b8161 100644 --- a/components/metaconfig/config-rpm.pan +++ b/components/metaconfig/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # metaconfig, 13.9.0, 1, 20130911-1927 + # metaconfig, 13.1.2, 1, 20131015-1106 # unique template components/metaconfig/config-rpm; @@ -25,7 +25,7 @@ include { 'components/metaconfig/config-common' }; prefix '/software/components/metaconfig'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-metaconfig", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-metaconfig", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/metaconfig/config-xml.pan b/components/metaconfig/config-xml.pan index ad96127c4..b04699253 100644 --- a/components/metaconfig/config-xml.pan +++ b/components/metaconfig/config-xml.pan @@ -14,7 +14,7 @@ # # # - # metaconfig, 13.9.0, 1, 20130911-1927 + # metaconfig, 13.1.2, 1, 20131015-1106 # unique template components/metaconfig/config-xml; diff --git a/components/metaconfig/config.pan b/components/metaconfig/config.pan index 2fc330189..573de2817 100644 --- a/components/metaconfig/config.pan +++ b/components/metaconfig/config.pan @@ -14,7 +14,7 @@ # # # - # metaconfig, 13.9.0, 1, 20130911-1927 + # metaconfig, 13.1.2, 1, 20131015-1106 # unique template components/metaconfig/config; diff --git a/components/metaconfig/schema.pan b/components/metaconfig/schema.pan index 3b2cdc710..be07b9dfb 100644 --- a/components/metaconfig/schema.pan +++ b/components/metaconfig/schema.pan @@ -14,7 +14,7 @@ # # # - # metaconfig, 13.9.0, 1, 20130911-1927 + # metaconfig, 13.1.2, 1, 20131015-1106 # declaration template components/metaconfig/schema; diff --git a/components/mkgridmap/config-common.pan b/components/mkgridmap/config-common.pan new file mode 100644 index 000000000..5dc089cd8 --- /dev/null +++ b/components/mkgridmap/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # mkgridmap, 13.1.2, 1, 20131015-1127 + # + +unique template components/mkgridmap/config-common; + +include { 'components/mkgridmap/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/mkgridmap'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/mkgridmap/config-rpm.pan b/components/mkgridmap/config-rpm.pan new file mode 100644 index 000000000..94f1ceab0 --- /dev/null +++ b/components/mkgridmap/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # mkgridmap, 13.1.2, 1, 20131015-1127 + # + +unique template components/mkgridmap/config-rpm; + +include { 'components/mkgridmap/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/mkgridmap'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-mkgridmap','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/mkgridmap/config-xml.pan b/components/mkgridmap/config-xml.pan new file mode 100644 index 000000000..4ffd40926 --- /dev/null +++ b/components/mkgridmap/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # mkgridmap, 13.1.2, 1, 20131015-1127 + # + +unique template components/mkgridmap/config-xml; + +include { 'components/mkgridmap/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/mkgridmap'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/mkgridmap/mkgridmap.pm'); diff --git a/components/mkgridmap/config.pan b/components/mkgridmap/config.pan new file mode 100644 index 000000000..6472e88d0 --- /dev/null +++ b/components/mkgridmap/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # mkgridmap, 13.1.2, 1, 20131015-1127 + # + +unique template components/mkgridmap/config; + +include { 'components/mkgridmap/config-rpm' }; diff --git a/components/mkgridmap/schema.pan b/components/mkgridmap/schema.pan new file mode 100644 index 000000000..b43d5b334 --- /dev/null +++ b/components/mkgridmap/schema.pan @@ -0,0 +1,58 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # mkgridmap, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/mkgridmap/schema; + +include { 'quattor/schema' }; + +type structure_mkgridmap_local = { + 'cert' : string + 'user' : string +}; + +type structure_mkgridmap_lcmaps = { + 'flavor' : string = 'glite' with match(SELF,'edg|glite') + 'gridmapfile' : string = '/opt/edg/etc/lcmaps/gridmapfile' + 'groupmapfile' : string = '/opt/edg/etc/lcmaps/groupmapfile' +}; + +type mkgridmap_component_entry = extensible { + 'mkgridmapconf' : string + 'format' : string with (match(SELF, 'edg|lcgdm')) + 'command' ? string + # 'gmflocal' ? string # can have either string or list (hence "extensible") + # 'gmflocal' ? string[] # if you need a list, explicitly set to "null" before to remove default + 'lcuser' ? string + 'allow' ? string + 'deny' ? string + 'overwrite' : boolean + 'authURIs' ? type_hostURI[] + 'locals' ? structure_mkgridmap_local[] +}; + +type mkgridmap_component = { + include structure_component + 'entries' : mkgridmap_component_entry{} + 'lcmaps' ? structure_mkgridmap_lcmaps + 'voList' ? string[] +}; + +bind '/software/components/mkgridmap' = mkgridmap_component; + diff --git a/components/moab/config-common.pan b/components/moab/config-common.pan new file mode 100644 index 000000000..351a36e56 --- /dev/null +++ b/components/moab/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # moab, 13.1.2, 1, 20131015-1127 + # + +unique template components/moab/config-common; + +include { 'components/moab/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/moab'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/moab/config-rpm.pan b/components/moab/config-rpm.pan new file mode 100644 index 000000000..8fe87322e --- /dev/null +++ b/components/moab/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # moab, 13.1.2, 1, 20131015-1127 + # + +unique template components/moab/config-rpm; + +include { 'components/moab/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/moab'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-moab','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/moab/config-xml.pan b/components/moab/config-xml.pan new file mode 100644 index 000000000..b948d30f2 --- /dev/null +++ b/components/moab/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # moab, 13.1.2, 1, 20131015-1127 + # + +unique template components/moab/config-xml; + +include { 'components/moab/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/moab'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/moab/moab.pm'); diff --git a/components/moab/config.pan b/components/moab/config.pan new file mode 100644 index 000000000..5322b15c6 --- /dev/null +++ b/components/moab/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # moab, 13.1.2, 1, 20131015-1127 + # + +unique template components/moab/config; + +include { 'components/moab/config-rpm' }; diff --git a/components/moab/schema.pan b/components/moab/schema.pan new file mode 100644 index 000000000..a5c20602b --- /dev/null +++ b/components/moab/schema.pan @@ -0,0 +1,66 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Stijn De Weirdt +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # moab, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/moab/schema; + +include { 'quattor/schema' }; + +## to be used for USERCFG, GROUPCFG... +type moab_component_cfg = string[]; + +type moab_component_include = { + 'contents' ? string + 'ok' : boolean = true +}; + +type moab_component = { + include structure_component + 'mode' ? string with match(SELF,'moab|maui') + + 'configPath' ? string + 'binPath' ? string + 'configFile' ? string + + 'sched' ? moab_component_cfg{} + 'rm' ? moab_component_cfg{} + + 'am' ? moab_component_cfg{} + + 'id' ? moab_component_cfg{} + + 'user' ? moab_component_cfg{} + 'group' ? moab_component_cfg{} + + 'node' ? moab_component_cfg{} + + 'account' ? moab_component_cfg{} + 'class' ? moab_component_cfg{} + 'qos' ? moab_component_cfg{} + + 'include' ? moab_component_include{} + + 'main' : string{} + 'priority' ? string{} + +}; + +bind '/software/components/moab' = moab_component; + + diff --git a/components/modprobe/config-common.pan b/components/modprobe/config-common.pan index 9776739f7..881ea83a6 100644 --- a/components/modprobe/config-common.pan +++ b/components/modprobe/config-common.pan @@ -14,7 +14,7 @@ # # # - # modprobe, 13.9.0, 1, 20130911-1927 + # modprobe, 13.1.2, 1, 20131015-1106 # unique template components/modprobe/config-common; @@ -24,7 +24,7 @@ include { 'components/modprobe/schema' }; # Set prefix to root of component configuration. prefix '/software/components/modprobe'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/modprobe/config-rpm.pan b/components/modprobe/config-rpm.pan index 434970791..5bd845ccc 100644 --- a/components/modprobe/config-rpm.pan +++ b/components/modprobe/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/modprobe/config-rpm; include { 'components/modprobe/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-modprobe", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-modprobe", "13.1.2-1", "noarch"); "/software/components/modprobe/dependencies/pre" ?= list("spma"); diff --git a/components/modprobe/config-xml.pan b/components/modprobe/config-xml.pan index f16d5ca99..5619b76c1 100644 --- a/components/modprobe/config-xml.pan +++ b/components/modprobe/config-xml.pan @@ -14,7 +14,7 @@ # # # - # modprobe, 13.9.0, 1, 20130911-1927 + # modprobe, 13.1.2, 1, 20131015-1106 # unique template components/modprobe/config-xml; diff --git a/components/modprobe/config.pan b/components/modprobe/config.pan index 2dcbff81e..ea427247d 100644 --- a/components/modprobe/config.pan +++ b/components/modprobe/config.pan @@ -14,7 +14,7 @@ # # # - # modprobe, 13.9.0, 1, 20130911-1927 + # modprobe, 13.1.2, 1, 20131015-1106 # unique template components/modprobe/config; diff --git a/components/myproxy/config-common.pan b/components/myproxy/config-common.pan new file mode 100644 index 000000000..ddda5ca8d --- /dev/null +++ b/components/myproxy/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # myproxy, 13.1.2, 1, 20131015-1127 + # + +unique template components/myproxy/config-common; + +include { 'components/myproxy/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/myproxy'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/myproxy/config-rpm.pan b/components/myproxy/config-rpm.pan new file mode 100644 index 000000000..2f103d853 --- /dev/null +++ b/components/myproxy/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # myproxy, 13.1.2, 1, 20131015-1127 + # + +unique template components/myproxy/config-rpm; + +include { 'components/myproxy/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/myproxy'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-myproxy','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/myproxy/config-xml.pan b/components/myproxy/config-xml.pan new file mode 100644 index 000000000..3beefcc38 --- /dev/null +++ b/components/myproxy/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # myproxy, 13.1.2, 1, 20131015-1127 + # + +unique template components/myproxy/config-xml; + +include { 'components/myproxy/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/myproxy'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/myproxy/myproxy.pm'); diff --git a/components/myproxy/config.pan b/components/myproxy/config.pan new file mode 100644 index 000000000..660caabbc --- /dev/null +++ b/components/myproxy/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # myproxy, 13.1.2, 1, 20131015-1127 + # + +unique template components/myproxy/config; + +include { 'components/myproxy/config-rpm' }; diff --git a/components/myproxy/schema.pan b/components/myproxy/schema.pan new file mode 100644 index 000000000..5604c4476 --- /dev/null +++ b/components/myproxy/schema.pan @@ -0,0 +1,54 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # myproxy, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/myproxy/schema; + +include { 'quattor/schema' }; + +# Function to validate component configuration, in particular +# ensure than obsolete trustedDNs is not specified as the same +# time as new authorizedDNs and defaultDNs. + +function component_myproxy_options_valid = { + if ( is_defined(SELF['trustedDNs']) && (is_defined(SELF['authorizedDNs']) || is_defined(SELF['defaultDNs'])) ) { + error('trustedDNs is obsolete and cannot be mixed with authorizedDNs and defaultDNs'); + }; + true; +}; + + +type myproxy_component_policies = { + 'renewers' ? string[] + 'retrievers' ? string[] + 'keyRetrievers' ? string[] + 'trustedRetrievers' ? string[] +}; + +type myproxy_component = { + include structure_component + 'flavor' : string = 'edg' with match(SELF,'^(edg|glite)$') + 'confFile' ? string = 'opt/edg/etc/edg-myproxy.conf' + 'daemonName' : string = 'myproxy' with match(SELF, '^(myproxy|myproxy-server)$') + 'trustedDNs' ? string[] + 'authorizedDNs' ? myproxy_component_policies + 'defaultDNs' ? myproxy_component_policies +} with component_myproxy_options_valid(SELF); + +bind '/software/components/myproxy' = myproxy_component; diff --git a/components/mysql/config-common.pan b/components/mysql/config-common.pan index 4f941c3bc..6af43cc68 100644 --- a/components/mysql/config-common.pan +++ b/components/mysql/config-common.pan @@ -14,7 +14,7 @@ # # # - # mysql, 13.9.0, 1, 20130911-1927 + # mysql, 13.1.2, 1, 20131015-1106 # unique template components/mysql/config-common; @@ -24,7 +24,7 @@ include { 'components/mysql/schema' }; # Set prefix to root of component configuration. prefix '/software/components/mysql'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/mysql/config-rpm.pan b/components/mysql/config-rpm.pan index bc6297ce5..48b12f7f7 100644 --- a/components/mysql/config-rpm.pan +++ b/components/mysql/config-rpm.pan @@ -19,10 +19,10 @@ unique template components/mysql/config-rpm; include { 'components/mysql/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-mysql", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-mysql", "13.1.2-1", "noarch"); -'/software/components/mysql/version' ?= '13.9.0'; +'/software/components/mysql/version' ?= '13.1.2'; "/software/components/mysql/dependencies/pre" ?= list("spma"); "/software/components/mysql/active" ?= true; diff --git a/components/mysql/config-xml.pan b/components/mysql/config-xml.pan index 344e6f64a..6dbb1d931 100644 --- a/components/mysql/config-xml.pan +++ b/components/mysql/config-xml.pan @@ -14,7 +14,7 @@ # # # - # mysql, 13.9.0, 1, 20130911-1927 + # mysql, 13.1.2, 1, 20131015-1106 # unique template components/mysql/config-xml; diff --git a/components/mysql/config.pan b/components/mysql/config.pan index ba4cb509c..0cff9cb0f 100644 --- a/components/mysql/config.pan +++ b/components/mysql/config.pan @@ -14,7 +14,7 @@ # # # - # mysql, 13.9.0, 1, 20130911-1927 + # mysql, 13.1.2, 1, 20131015-1106 # unique template components/mysql/config; diff --git a/components/nagios/config-common.pan b/components/nagios/config-common.pan index 70c4f5897..1e7f3f332 100644 --- a/components/nagios/config-common.pan +++ b/components/nagios/config-common.pan @@ -14,7 +14,7 @@ # # # - # nagios, 13.9.0, 1, 20130911-1927 + # nagios, 13.1.2, 1, 20131015-1106 # unique template components/nagios/config-common; @@ -24,7 +24,7 @@ include { 'components/nagios/schema' }; # Set prefix to root of component configuration. prefix '/software/components/nagios'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/nagios/config-rpm.pan b/components/nagios/config-rpm.pan index b275f13fb..c71b4c573 100644 --- a/components/nagios/config-rpm.pan +++ b/components/nagios/config-rpm.pan @@ -25,7 +25,7 @@ include {'components/nagios/functions'}; include {'components/nagios/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-nagios", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-nagios", "13.1.2-1", "noarch"); "/software/components/nagios/dependencies/pre" ?= list ("spma"); diff --git a/components/nagios/config-xml.pan b/components/nagios/config-xml.pan index 9b85310ed..0d82ae43c 100644 --- a/components/nagios/config-xml.pan +++ b/components/nagios/config-xml.pan @@ -14,7 +14,7 @@ # # # - # nagios, 13.9.0, 1, 20130911-1927 + # nagios, 13.1.2, 1, 20131015-1106 # unique template components/nagios/config-xml; diff --git a/components/nagios/config.pan b/components/nagios/config.pan index 6438e65f2..cd5206ac1 100644 --- a/components/nagios/config.pan +++ b/components/nagios/config.pan @@ -14,7 +14,7 @@ # # # - # nagios, 13.9.0, 1, 20130911-1927 + # nagios, 13.1.2, 1, 20131015-1106 # unique template components/nagios/config; diff --git a/components/named/config-common.pan b/components/named/config-common.pan index 0362aba9d..16c239870 100644 --- a/components/named/config-common.pan +++ b/components/named/config-common.pan @@ -14,7 +14,7 @@ # # # - # named, 13.9.0, 1, 20130911-1927 + # named, 13.1.2, 1, 20131015-1106 # unique template components/named/config-common; @@ -24,7 +24,7 @@ include { 'components/named/schema' }; # Set prefix to root of component configuration. prefix '/software/components/named'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/named/config-rpm.pan b/components/named/config-rpm.pan index 13f7f8b7a..1000a40cc 100644 --- a/components/named/config-rpm.pan +++ b/components/named/config-rpm.pan @@ -28,10 +28,10 @@ unique template components/named/config-rpm; include { 'components/named/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-named", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-named", "13.1.2-1", "noarch"); -'/software/components/named/version' ?= '13.9.0'; +'/software/components/named/version' ?= '13.1.2'; "/software/components/named/dependencies/pre" ?= list("spma"); "/software/components/named/active" ?= true; diff --git a/components/named/config-xml.pan b/components/named/config-xml.pan index e1ea6790b..721e75e50 100644 --- a/components/named/config-xml.pan +++ b/components/named/config-xml.pan @@ -14,7 +14,7 @@ # # # - # named, 13.9.0, 1, 20130911-1927 + # named, 13.1.2, 1, 20131015-1106 # unique template components/named/config-xml; diff --git a/components/named/config.pan b/components/named/config.pan index 3ec3d0b46..5c0b9a44c 100644 --- a/components/named/config.pan +++ b/components/named/config.pan @@ -14,7 +14,7 @@ # # # - # named, 13.9.0, 1, 20130911-1927 + # named, 13.1.2, 1, 20131015-1106 # unique template components/named/config; diff --git a/components/network/config-common.pan b/components/network/config-common.pan index e4f8404e9..09b32094a 100644 --- a/components/network/config-common.pan +++ b/components/network/config-common.pan @@ -14,7 +14,7 @@ # # # - # network, 13.9.0, 1, 20130911-1927 + # network, 13.1.2, 1, 20131015-1106 # unique template components/network/config-common; @@ -24,7 +24,7 @@ include { 'components/network/schema' }; # Set prefix to root of component configuration. prefix '/software/components/network'; -'version' = '13.9.0'; +'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/network/config-rpm.pan b/components/network/config-rpm.pan index e29a5aa78..fdfdcee73 100644 --- a/components/network/config-rpm.pan +++ b/components/network/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # network, 13.9.0, 1, 20130911-1927 + # network, 13.1.2, 1, 20131015-1106 # unique template components/network/config-rpm; @@ -25,6 +25,6 @@ include { 'components/network/config-common' }; prefix '/software/components/network'; # Install Quattor configuration module via RPM package. -'/software/packages' = pkg_repl('ncm-network','13.9.0-1','noarch'); +'/software/packages' = pkg_repl('ncm-network','13.1.2-1','noarch'); 'dependencies/pre' ?= list('spma'); diff --git a/components/network/config-xml.pan b/components/network/config-xml.pan index afa109857..01f1ccb4f 100644 --- a/components/network/config-xml.pan +++ b/components/network/config-xml.pan @@ -14,7 +14,7 @@ # # # - # network, 13.9.0, 1, 20130911-1927 + # network, 13.1.2, 1, 20131015-1106 # unique template components/network/config-xml; diff --git a/components/network/config.pan b/components/network/config.pan index 2370272bd..4d0f1bcf9 100644 --- a/components/network/config.pan +++ b/components/network/config.pan @@ -14,7 +14,7 @@ # # # - # network, 13.9.0, 1, 20130911-1927 + # network, 13.1.2, 1, 20131015-1106 # diff --git a/components/network/schema.pan b/components/network/schema.pan index 0053833a6..6ae670eaa 100644 --- a/components/network/schema.pan +++ b/components/network/schema.pan @@ -14,7 +14,7 @@ # # # - # network, 13.9.0, 1, 20130911-1927 + # network, 13.1.2, 1, 20131015-1106 # declaration template components/network/schema; diff --git a/components/networkupstools/config-common.pan b/components/networkupstools/config-common.pan index e698f736a..f8fbeec11 100644 --- a/components/networkupstools/config-common.pan +++ b/components/networkupstools/config-common.pan @@ -14,7 +14,7 @@ # # # - # networkupstools, 13.9.0, 1, 20130911-1927 + # networkupstools, 13.1.2, 1, 20131015-1106 # unique template components/networkupstools/config-common; @@ -24,7 +24,7 @@ include { 'components/networkupstools/schema' }; # Set prefix to root of component configuration. prefix '/software/components/networkupstools'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/networkupstools/config-rpm.pan b/components/networkupstools/config-rpm.pan index 1c9ba9c59..3563499bc 100644 --- a/components/networkupstools/config-rpm.pan +++ b/components/networkupstools/config-rpm.pan @@ -18,7 +18,7 @@ unique template components/networkupstools/config-rpm; include {'components/networkupstools/schema'}; -"/software/packages" = pkg_repl("ncm-networkupstools", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-networkupstools", "13.1.2-1", "noarch"); "/software/components/networkupstools/dependencies/pre" = list ("spma"); "/software/components/networkupstools/active" ?= true; diff --git a/components/networkupstools/config-xml.pan b/components/networkupstools/config-xml.pan index 285401e41..b2ebc545c 100644 --- a/components/networkupstools/config-xml.pan +++ b/components/networkupstools/config-xml.pan @@ -14,7 +14,7 @@ # # # - # networkupstools, 13.9.0, 1, 20130911-1927 + # networkupstools, 13.1.2, 1, 20131015-1106 # unique template components/networkupstools/config-xml; diff --git a/components/networkupstools/config.pan b/components/networkupstools/config.pan index 7cb9ae028..7c5efef0a 100644 --- a/components/networkupstools/config.pan +++ b/components/networkupstools/config.pan @@ -14,7 +14,7 @@ # # # - # networkupstools, 13.9.0, 1, 20130911-1927 + # networkupstools, 13.1.2, 1, 20131015-1106 # unique template components/networkupstools/config; diff --git a/components/nfs/config-common.pan b/components/nfs/config-common.pan index 9914b290b..4c3ec8235 100644 --- a/components/nfs/config-common.pan +++ b/components/nfs/config-common.pan @@ -14,7 +14,7 @@ # # # - # nfs, 13.9.0, 1, 20130911-1927 + # nfs, 13.1.2, 1, 20131015-1106 # unique template components/nfs/config-common; @@ -24,7 +24,7 @@ include { 'components/nfs/schema' }; # Set prefix to root of component configuration. prefix '/software/components/nfs'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/nfs/config-rpm.pan b/components/nfs/config-rpm.pan index e8114ae21..491696de3 100644 --- a/components/nfs/config-rpm.pan +++ b/components/nfs/config-rpm.pan @@ -19,9 +19,9 @@ unique template components/nfs/config-rpm; include { 'components/nfs/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-nfs", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-nfs", "13.1.2-1", "noarch"); '/software/components/nfs/dependencies/pre' ?= list('spma'); -'/software/components/nfs/version' = '13.9.0'; +'/software/components/nfs/version' = '13.1.2'; diff --git a/components/nfs/config-xml.pan b/components/nfs/config-xml.pan index bdde2ea4d..32b68f9d5 100644 --- a/components/nfs/config-xml.pan +++ b/components/nfs/config-xml.pan @@ -14,7 +14,7 @@ # # # - # nfs, 13.9.0, 1, 20130911-1927 + # nfs, 13.1.2, 1, 20131015-1106 # unique template components/nfs/config-xml; diff --git a/components/nfs/config.pan b/components/nfs/config.pan index 8ab9ac8f1..faabe7eaf 100644 --- a/components/nfs/config.pan +++ b/components/nfs/config.pan @@ -14,7 +14,7 @@ # # # - # nfs, 13.9.0, 1, 20130911-1927 + # nfs, 13.1.2, 1, 20131015-1106 # unique template components/nfs/config; diff --git a/components/nrpe/config-common.pan b/components/nrpe/config-common.pan index df54eb576..b6c0aa56e 100644 --- a/components/nrpe/config-common.pan +++ b/components/nrpe/config-common.pan @@ -11,7 +11,7 @@ # # # - # nrpe, 13.9.0, 1, 20130911-1927 + # nrpe, 13.1.2, 1, 20131015-1106 # unique template components/nrpe/config-common; @@ -21,7 +21,7 @@ include { 'components/nrpe/schema' }; # Set prefix to root of component configuration. prefix '/software/components/nrpe'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/nrpe/config-rpm.pan b/components/nrpe/config-rpm.pan index 0ade96c0f..c7c9ac588 100644 --- a/components/nrpe/config-rpm.pan +++ b/components/nrpe/config-rpm.pan @@ -21,7 +21,7 @@ unique template components/nrpe/config-rpm; include {'components/nrpe/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-nrpe", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-nrpe", "13.1.2-1", "noarch"); "/software/components/nrpe/dependencies/pre" ?= list ("spma"); diff --git a/components/nrpe/config-xml.pan b/components/nrpe/config-xml.pan index d7907f342..aded10e23 100644 --- a/components/nrpe/config-xml.pan +++ b/components/nrpe/config-xml.pan @@ -11,7 +11,7 @@ # # # - # nrpe, 13.9.0, 1, 20130911-1927 + # nrpe, 13.1.2, 1, 20131015-1106 # unique template components/nrpe/config-xml; diff --git a/components/nrpe/config.pan b/components/nrpe/config.pan index fbd3692f9..6b3368e33 100644 --- a/components/nrpe/config.pan +++ b/components/nrpe/config.pan @@ -11,7 +11,7 @@ # # # - # nrpe, 13.9.0, 1, 20130911-1927 + # nrpe, 13.1.2, 1, 20131015-1106 # unique template components/nrpe/config; diff --git a/components/nsca/config-common.pan b/components/nsca/config-common.pan index cf9e35e5d..ad0e7d4fc 100644 --- a/components/nsca/config-common.pan +++ b/components/nsca/config-common.pan @@ -14,7 +14,7 @@ # # # - # nsca, 13.9.0, 1, 20130911-1927 + # nsca, 13.1.2, 1, 20131015-1106 # unique template components/nsca/config-common; @@ -24,7 +24,7 @@ include { 'components/nsca/schema' }; # Set prefix to root of component configuration. prefix '/software/components/nsca'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/nsca/config-rpm.pan b/components/nsca/config-rpm.pan index 3c1d65fce..d0eb31be1 100644 --- a/components/nsca/config-rpm.pan +++ b/components/nsca/config-rpm.pan @@ -24,7 +24,7 @@ unique template components/nsca/config-rpm; include {'components/nsca/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-nsca", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-nsca", "13.1.2-1", "noarch"); "/software/components/nsca/dependencies/pre" ?= list ("spma", "accounts"); diff --git a/components/nsca/config-xml.pan b/components/nsca/config-xml.pan index 8777397fe..ab6cf8b57 100644 --- a/components/nsca/config-xml.pan +++ b/components/nsca/config-xml.pan @@ -14,7 +14,7 @@ # # # - # nsca, 13.9.0, 1, 20130911-1927 + # nsca, 13.1.2, 1, 20131015-1106 # unique template components/nsca/config-xml; diff --git a/components/nsca/config.pan b/components/nsca/config.pan index b0f7f8a31..709962a8e 100644 --- a/components/nsca/config.pan +++ b/components/nsca/config.pan @@ -14,7 +14,7 @@ # # # - # nsca, 13.9.0, 1, 20130911-1927 + # nsca, 13.1.2, 1, 20131015-1106 # unique template components/nsca/config; diff --git a/components/nscd/config-common.pan b/components/nscd/config-common.pan index 7769d7523..6c7aaf400 100644 --- a/components/nscd/config-common.pan +++ b/components/nscd/config-common.pan @@ -14,7 +14,7 @@ # # # - # nscd, 13.9.0, 1, 20130911-1927 + # nscd, 13.1.2, 1, 20131015-1106 # unique template components/nscd/config-common; @@ -24,7 +24,7 @@ include { 'components/nscd/schema' }; # Set prefix to root of component configuration. prefix '/software/components/nscd'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/nscd/config-rpm.pan b/components/nscd/config-rpm.pan index 6b7ff04c5..e2a77010a 100644 --- a/components/nscd/config-rpm.pan +++ b/components/nscd/config-rpm.pan @@ -23,5 +23,5 @@ include { 'components/nscd/schema' }; "/software/components/nscd/hosts/positive-time-to-live" ?= 300; "/software/components/nscd/active" ?= true; "/software/components/nscd/dispatch" ?= true; -"/software/packages" = pkg_repl("ncm-nscd", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-nscd", "13.1.2-1", "noarch"); diff --git a/components/nscd/config-xml.pan b/components/nscd/config-xml.pan index b399f9faa..21cbd2245 100644 --- a/components/nscd/config-xml.pan +++ b/components/nscd/config-xml.pan @@ -14,7 +14,7 @@ # # # - # nscd, 13.9.0, 1, 20130911-1927 + # nscd, 13.1.2, 1, 20131015-1106 # unique template components/nscd/config-xml; diff --git a/components/nscd/config.pan b/components/nscd/config.pan index 99802cfe3..51073e8d3 100644 --- a/components/nscd/config.pan +++ b/components/nscd/config.pan @@ -14,7 +14,7 @@ # # # - # nscd, 13.9.0, 1, 20130911-1927 + # nscd, 13.1.2, 1, 20131015-1106 # unique template components/nscd/config; diff --git a/components/ntpd/config-common.pan b/components/ntpd/config-common.pan index 47704a8db..36bb850aa 100644 --- a/components/ntpd/config-common.pan +++ b/components/ntpd/config-common.pan @@ -14,7 +14,7 @@ # # # - # ntpd, 13.9.0, 1, 20130911-1927 + # ntpd, 13.1.2, 1, 20131015-1106 # unique template components/ntpd/config-common; @@ -24,7 +24,7 @@ include { 'components/ntpd/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ntpd'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ntpd/config-rpm.pan b/components/ntpd/config-rpm.pan index 36730a80b..32ad29b3f 100644 --- a/components/ntpd/config-rpm.pan +++ b/components/ntpd/config-rpm.pan @@ -19,10 +19,10 @@ unique template components/ntpd/config-rpm; include { 'components/ntpd/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-ntpd", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ntpd", "13.1.2-1", "noarch"); -'/software/components/ntpd/version' ?= '13.9.0'; +'/software/components/ntpd/version' ?= '13.1.2'; "/software/components/ntpd/dependencies/pre" ?= list("spma"); "/software/components/ntpd/active" ?= true; diff --git a/components/ntpd/config-xml.pan b/components/ntpd/config-xml.pan index 2b08026a2..c676254b5 100644 --- a/components/ntpd/config-xml.pan +++ b/components/ntpd/config-xml.pan @@ -14,7 +14,7 @@ # # # - # ntpd, 13.9.0, 1, 20130911-1927 + # ntpd, 13.1.2, 1, 20131015-1106 # unique template components/ntpd/config-xml; diff --git a/components/ntpd/config.pan b/components/ntpd/config.pan index cf9fd5ae6..8110f52c5 100644 --- a/components/ntpd/config.pan +++ b/components/ntpd/config.pan @@ -14,7 +14,7 @@ # # # - # ntpd, 13.9.0, 1, 20130911-1927 + # ntpd, 13.1.2, 1, 20131015-1106 # unique template components/ntpd/config; diff --git a/components/ofed/config-common.pan b/components/ofed/config-common.pan index 58830d4dd..2d22c70f1 100644 --- a/components/ofed/config-common.pan +++ b/components/ofed/config-common.pan @@ -14,7 +14,7 @@ # # # - # ofed, 13.9.0, 1, 20130911-1927 + # ofed, 13.1.2, 1, 20131015-1106 # unique template components/ofed/config-common; @@ -24,7 +24,7 @@ include { 'components/ofed/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ofed'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ofed/config-rpm.pan b/components/ofed/config-rpm.pan index 4a12fed44..f909d348e 100644 --- a/components/ofed/config-rpm.pan +++ b/components/ofed/config-rpm.pan @@ -19,10 +19,10 @@ unique template components/ofed/config-rpm; include { 'components/ofed/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-ofed", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ofed", "13.1.2-1", "noarch"); -'/software/components/ofed/version' ?= '13.9.0'; +'/software/components/ofed/version' ?= '13.1.2'; "/software/components/ofed/dependencies/pre" ?= list("spma"); "/software/components/ofed/active" ?= true; diff --git a/components/ofed/config-xml.pan b/components/ofed/config-xml.pan index acc4780d1..bc4e357f2 100644 --- a/components/ofed/config-xml.pan +++ b/components/ofed/config-xml.pan @@ -14,7 +14,7 @@ # # # - # ofed, 13.9.0, 1, 20130911-1927 + # ofed, 13.1.2, 1, 20131015-1106 # unique template components/ofed/config-xml; diff --git a/components/ofed/config.pan b/components/ofed/config.pan index 48e884558..483aaa9ef 100644 --- a/components/ofed/config.pan +++ b/components/ofed/config.pan @@ -14,7 +14,7 @@ # # # - # ofed, 13.9.0, 1, 20130911-1927 + # ofed, 13.1.2, 1, 20131015-1106 # unique template components/ofed/config; diff --git a/components/openldap/config-common.pan b/components/openldap/config-common.pan index 7aaefb045..cbdc78eeb 100644 --- a/components/openldap/config-common.pan +++ b/components/openldap/config-common.pan @@ -14,7 +14,7 @@ # # # - # openldap, 13.9.0, 1, 20130911-1927 + # openldap, 13.1.2, 1, 20131015-1106 # unique template components/openldap/config-common; @@ -24,7 +24,7 @@ include { 'components/openldap/schema' }; # Set prefix to root of component configuration. prefix '/software/components/openldap'; -'version' = '13.9.0'; +'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/openldap/config-rpm.pan b/components/openldap/config-rpm.pan index 058a04c36..3a66f238a 100644 --- a/components/openldap/config-rpm.pan +++ b/components/openldap/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # openldap, 13.9.0, 1, 20130911-1927 + # openldap, 13.1.2, 1, 20131015-1106 # unique template components/openldap/config-rpm; @@ -25,6 +25,6 @@ include { 'components/openldap/config-common' }; prefix '/software/components/openldap'; # Install Quattor configuration module via RPM package. -'/software/packages' = pkg_repl('ncm-openldap','13.9.0-1','noarch'); +'/software/packages' = pkg_repl('ncm-openldap','13.1.2-1','noarch'); 'dependencies/pre' ?= list('spma'); diff --git a/components/openldap/config-xml.pan b/components/openldap/config-xml.pan index dd7a01a7b..2723aa988 100644 --- a/components/openldap/config-xml.pan +++ b/components/openldap/config-xml.pan @@ -14,7 +14,7 @@ # # # - # openldap, 13.9.0, 1, 20130911-1927 + # openldap, 13.1.2, 1, 20131015-1106 # unique template components/openldap/config-xml; diff --git a/components/openldap/config.pan b/components/openldap/config.pan index 84348bee2..fc8fe3d88 100644 --- a/components/openldap/config.pan +++ b/components/openldap/config.pan @@ -14,7 +14,7 @@ # # # - # openldap, 13.9.0, 1, 20130911-1927 + # openldap, 13.1.2, 1, 20131015-1106 # unique template components/openldap/config; diff --git a/components/openldap/schema.pan b/components/openldap/schema.pan index a8dcc04c8..efa424260 100644 --- a/components/openldap/schema.pan +++ b/components/openldap/schema.pan @@ -15,59 +15,8 @@ declaration template components/openldap/schema; include { 'quattor/schema' }; -function openldap_loglevels_to_long = { - # converts a list of named loglevels to its numeric value - # returns undef in case of unknown entry - # returns (whichever comes first in list) - # 0 if one of the values is nologging - # -1 if one the values is any - if ( ARGC != 1 || ! is_list(ARGV[0])) { - error('openldap_loglevel_map requires 1 list argument'); - }; - lvls = ARGV[0]; - - default = 'stats'; - - the_map = nlist( - "any", -1, # log all - "nologging", 0, # (has no official naming) absolutely no logging (none just means very very high loglevel) - "trace", 1, # trace function calls - "packets", 2, # debug packet handling - "args", 4, # heavy trace debugging (function args) - "conns", 8, # connection management - "BER", 16, # print out packets sent and received - "filter", 32, # search filter processing - "config", 64, # configuration file processing - "ACL", 128, # access control list processing - "stats", 256, # connections, LDAP operations, results (recommended) - "stats2", 512, # stats log entries sent - "shell", 1024, # print communication with shell backends - "parse", 2048, # entry parsing - "sync", 16384, # LDAPSync replication - "none", 32768, # only messages that get logged whatever log level is set - ); - - if (length(lvls) == 0) { - lvls = list(default); - }; - - total=0; - foreach(idx;lvl;lvls) { - if(!exists(the_map[lvl])) { - return(undef); - }; - if(lvl == 'nologging' || lvl == 'any') { - return(the_map[lvl]); - }; - total = total | the_map[lvl]; - }; - total; -}; - type long_pow2 = long with (SELF==1||SELF==2||SELF==4||SELF==8|| SELF==16||SELF==32||SELF==64||SELF==128||SELF==256||SELF==512|| - SELF==1024||SELF==2048||SELF==4096||SELF==8192||SELF==16384|| - SELF==32768||SELF==65536|| error("Only powers of two are accepted")); # Possible acceptable values @@ -94,14 +43,14 @@ type ldap_access_item = { }; type ldap_access = { - # what: what = literal string (eg *) - "what" ? string - # what attrs turns insto attrs=opt1,opt2 - "attrs" ? string[] - - - # by : eg list(list(who,access,control)) - "by" : string[][] + ## what: hwta = literal string (eg *) + "what" ? string + ## what attrs turns insto attrs=opt1,opt2 + "attrs" ? string[] + + + ## by : eg list(list(who,access,control)) + "by" : string[][] }; type auth_regexp = { @@ -127,15 +76,15 @@ type tls_options = { type ldap_global = { "access" : ldap_access[] = list() - "allow" ? string[] - "argsfile" ? string - "attributeoptions" ? string[] - # Indexed by attribute name. See RFC4512 for all details. - "attributetype" ? ldap_syntax{} - "authid-rewrite" ? string - "authz-policy" ? string - "authz-regexp" : auth_regexp[] = list() - "concurrency" ? long + "allow" ? string[] + "argsfile" ? string + "attributeoptions" ? string[] +# Indexed by attribute name. See RFC4512 for all details. + "attributetype" ? ldap_syntax{} + "authid-rewrite" ? string + "authz-policy" ? string + "authz-regexp" : auth_regexp[] = list() + "concurrency" ? long "conn_max_pending_auth" ? long "defaultsearchbase" ? string "disallow" ? string[] @@ -181,9 +130,9 @@ type ldap_global = { type ldap_database_string = string with match(SELF, "^(bdb|config|dnssrv|hdb|ldap|ldif|meta|" + - "monitor|null|passwd|perl|relay|shell|sql)$") || + "monitor|null|passwd|perl|relay|shell|sql)$") || error("Unknown LDAP database type. " + - "Check sladpd.conf man page"); + "Check sladpd.conf man page"); type ldap_ops = string with match(SELF, '^(add|bind|compare|delete|modify|rename|search|read|write|'+ @@ -234,13 +183,13 @@ type ldap_replica_cfg = { }; -# overlay Replication (SyncProvider) +## overlay Replication (SyncProvider) type ldap_overlay_syncprov = { - # use a list for checkpoint: first val is ops, second value is minutes + ## use a list for checkpoint: first val is ops, second value is minutes "checkpoint" ? long[] with (length(SELF) == 2) "sessionlog" ? long "nopresent" ? boolean - "reloadhint" ? boolean + "reloadhint" ? boolean }; type type_ldap_overlay = { @@ -273,13 +222,13 @@ type ldap_database = { "db_config" ? type_db_config "directory" ? string "extra_attrs" ? string[] - # eg list(list(list("entryCSN","entryUUID"),list("eq"))) + ## eg list(list(list("entryCSN","entryUUID"),list("eq"))) "index" ? string[][][] "hidden" : boolean = false "lastmod" : boolean = true "limits" ? ldap_database_limits{} "maxderefdepth" : long = 15 - "mirrormode" ? boolean # don't set it (not setting it is not equal to false or true) + "mirrormode" : boolean = false "monitoring" ? boolean "overlay" ? type_ldap_overlay "readonly" ? boolean = false @@ -311,11 +260,7 @@ type component_openldap = { 'global' ? ldap_global 'backends' ? ldap_database[] 'databases' ? ldap_database[] - 'monitoring' ? ldap_monitoring - # move the /etc/openldap/slapd.d dir (this - # configuration method takes preferences over the - # slapd.conf file, but it is not supported by the component) - 'move_slapdd' ? boolean = true + 'monitoring' ? ldap_monitoring }; bind '/software/components/openldap' = component_openldap; diff --git a/components/openvpn/config-common.pan b/components/openvpn/config-common.pan index 988c43971..d8e8e09ad 100644 --- a/components/openvpn/config-common.pan +++ b/components/openvpn/config-common.pan @@ -14,7 +14,7 @@ # # # - # openvpn, 13.9.0, 1, 20130911-1927 + # openvpn, 13.1.2, 1, 20131015-1106 # unique template components/openvpn/config-common; @@ -24,7 +24,7 @@ include { 'components/openvpn/schema' }; # Set prefix to root of component configuration. prefix '/software/components/openvpn'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/openvpn/config-rpm.pan b/components/openvpn/config-rpm.pan index 613025044..d6eb58ce1 100644 --- a/components/openvpn/config-rpm.pan +++ b/components/openvpn/config-rpm.pan @@ -24,7 +24,7 @@ unique template components/openvpn/config-rpm; include {'components/openvpn/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-openvpn", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-openvpn", "13.1.2-1", "noarch"); "/software/components/openvpn/dependencies/pre" ?= list ("spma"); diff --git a/components/openvpn/config-xml.pan b/components/openvpn/config-xml.pan index 3bb61cf02..a3c7bf06f 100644 --- a/components/openvpn/config-xml.pan +++ b/components/openvpn/config-xml.pan @@ -14,7 +14,7 @@ # # # - # openvpn, 13.9.0, 1, 20130911-1927 + # openvpn, 13.1.2, 1, 20131015-1106 # unique template components/openvpn/config-xml; diff --git a/components/openvpn/config.pan b/components/openvpn/config.pan index 698a1a1a4..965379b79 100644 --- a/components/openvpn/config.pan +++ b/components/openvpn/config.pan @@ -14,7 +14,7 @@ # # # - # openvpn, 13.9.0, 1, 20130911-1927 + # openvpn, 13.1.2, 1, 20131015-1106 # unique template components/openvpn/config; diff --git a/components/openvpn/schema.pan b/components/openvpn/schema.pan index 680b6051e..771afa3c0 100644 --- a/components/openvpn/schema.pan +++ b/components/openvpn/schema.pan @@ -88,7 +88,7 @@ type structure_component_openvpn_client = { type structure_component_openvpn = { include structure_component - "server" ? structure_component_openvpn_server{} + "server" ? structure_component_openvpn_server "clients" ? structure_component_openvpn_client{} }; diff --git a/components/oramonserver/config-common.pan b/components/oramonserver/config-common.pan index da0e4e35d..a04333fdd 100644 --- a/components/oramonserver/config-common.pan +++ b/components/oramonserver/config-common.pan @@ -14,7 +14,7 @@ # # # - # oramonserver, 13.9.0, 1, 20130911-1927 + # oramonserver, 13.1.2, 1, 20131015-1106 # unique template components/oramonserver/config-common; @@ -24,7 +24,7 @@ include { 'components/oramonserver/schema' }; # Set prefix to root of component configuration. prefix '/software/components/oramonserver'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/oramonserver/config-rpm.pan b/components/oramonserver/config-rpm.pan index 7c507c51e..ed73d152e 100644 --- a/components/oramonserver/config-rpm.pan +++ b/components/oramonserver/config-rpm.pan @@ -20,7 +20,7 @@ unique template components/oramonserver/config-rpm; include {'components/oramonserver/schema'}; # Package to install. -"/software/packages" = pkg_repl("ncm-oramonserver", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-oramonserver", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/oramonserver/config-xml.pan b/components/oramonserver/config-xml.pan index 9acd93381..2b8de0e20 100644 --- a/components/oramonserver/config-xml.pan +++ b/components/oramonserver/config-xml.pan @@ -14,7 +14,7 @@ # # # - # oramonserver, 13.9.0, 1, 20130911-1927 + # oramonserver, 13.1.2, 1, 20131015-1106 # unique template components/oramonserver/config-xml; diff --git a/components/oramonserver/config.pan b/components/oramonserver/config.pan index 63993e96a..bc70851b3 100644 --- a/components/oramonserver/config.pan +++ b/components/oramonserver/config.pan @@ -14,7 +14,7 @@ # # # - # oramonserver, 13.9.0, 1, 20130911-1927 + # oramonserver, 13.1.2, 1, 20131015-1106 # unique template components/oramonserver/config; diff --git a/components/pacemaker/config-common.pan b/components/pacemaker/config-common.pan index d5247c4d6..ad74fac11 100644 --- a/components/pacemaker/config-common.pan +++ b/components/pacemaker/config-common.pan @@ -14,7 +14,7 @@ # # # - # pacemaker, 13.9.0, 1, 20130911-1927 + # pacemaker, 13.1.2, 1, 20131015-1106 # unique template components/pacemaker/config-common; @@ -24,7 +24,7 @@ include { 'components/pacemaker/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pacemaker'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pacemaker/config-rpm.pan b/components/pacemaker/config-rpm.pan index 7b04ef8a2..60c2a6061 100644 --- a/components/pacemaker/config-rpm.pan +++ b/components/pacemaker/config-rpm.pan @@ -26,7 +26,7 @@ unique template components/pacemaker/config-rpm; include { 'components/pacemaker/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-pacemaker", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pacemaker", "13.1.2-1", "noarch"); "/software/components/pacemaker/dependencies/pre" ?= list("spma"); diff --git a/components/pacemaker/config-xml.pan b/components/pacemaker/config-xml.pan index d1e06bdbb..62b1a9597 100644 --- a/components/pacemaker/config-xml.pan +++ b/components/pacemaker/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pacemaker, 13.9.0, 1, 20130911-1927 + # pacemaker, 13.1.2, 1, 20131015-1106 # unique template components/pacemaker/config-xml; diff --git a/components/pacemaker/config.pan b/components/pacemaker/config.pan index 7d9850723..7e3ffec18 100644 --- a/components/pacemaker/config.pan +++ b/components/pacemaker/config.pan @@ -14,7 +14,7 @@ # # # - # pacemaker, 13.9.0, 1, 20130911-1927 + # pacemaker, 13.1.2, 1, 20131015-1106 # unique template components/pacemaker/config; diff --git a/components/pakiti/config-common.pan b/components/pakiti/config-common.pan index 3f330c89f..0f1986da9 100644 --- a/components/pakiti/config-common.pan +++ b/components/pakiti/config-common.pan @@ -14,7 +14,7 @@ # # # - # pakiti, 13.9.0, 1, 20130911-1927 + # pakiti, 13.1.2, 1, 20131015-1106 # unique template components/pakiti/config-common; @@ -24,7 +24,7 @@ include { 'components/pakiti/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pakiti'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pakiti/config-rpm.pan b/components/pakiti/config-rpm.pan index ef17833f9..b69087cd8 100644 --- a/components/pakiti/config-rpm.pan +++ b/components/pakiti/config-rpm.pan @@ -20,7 +20,7 @@ unique template components/pakiti/config-rpm; include {'components/pakiti/schema'}; # Package to install. -"/software/packages" = pkg_repl("ncm-pakiti", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pakiti", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/pakiti/config-xml.pan b/components/pakiti/config-xml.pan index e8be6c2f6..d7e33fac2 100644 --- a/components/pakiti/config-xml.pan +++ b/components/pakiti/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pakiti, 13.9.0, 1, 20130911-1927 + # pakiti, 13.1.2, 1, 20131015-1106 # unique template components/pakiti/config-xml; diff --git a/components/pakiti/config.pan b/components/pakiti/config.pan index 9a9f88cc1..c18f48d5d 100644 --- a/components/pakiti/config.pan +++ b/components/pakiti/config.pan @@ -14,7 +14,7 @@ # # # - # pakiti, 13.9.0, 1, 20130911-1927 + # pakiti, 13.1.2, 1, 20131015-1106 # unique template components/pakiti/config; diff --git a/components/pam/config-common.pan b/components/pam/config-common.pan index 4538214e8..608679671 100644 --- a/components/pam/config-common.pan +++ b/components/pam/config-common.pan @@ -14,7 +14,7 @@ # # # - # pam, 13.9.0, 1, 20130911-1927 + # pam, 13.1.2, 1, 20131015-1106 # unique template components/pam/config-common; @@ -24,7 +24,7 @@ include { 'components/pam/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pam'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pam/config-rpm.pan b/components/pam/config-rpm.pan index f84127bfb..160706555 100644 --- a/components/pam/config-rpm.pan +++ b/components/pam/config-rpm.pan @@ -48,7 +48,7 @@ include {'components/pam/schema'}; include {'pan/functions'}; # standard component settings -"/software/components/pam/version" = '13.9.0'; +"/software/components/pam/version" = '13.1.2'; # release is not yet standard. #"/software/components/pam/release" = "1"; "/software/components/pam/active" ?= true; @@ -56,7 +56,7 @@ include {'pan/functions'}; "/software/components/pam/directory" ?= "/etc/pam.d"; "/software/components/pam/acldir" ?= "/etc/pam.acls"; -"/software/packages" = pkg_repl("ncm-pam", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pam", "13.1.2-1", "noarch"); # diff --git a/components/pam/config-xml.pan b/components/pam/config-xml.pan index 36735cfad..23141b86f 100644 --- a/components/pam/config-xml.pan +++ b/components/pam/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pam, 13.9.0, 1, 20130911-1927 + # pam, 13.1.2, 1, 20131015-1106 # unique template components/pam/config-xml; diff --git a/components/pam/config.pan b/components/pam/config.pan index fa88de982..f501070da 100644 --- a/components/pam/config.pan +++ b/components/pam/config.pan @@ -14,7 +14,7 @@ # # # - # pam, 13.9.0, 1, 20130911-1927 + # pam, 13.1.2, 1, 20131015-1106 # unique template components/pam/config; diff --git a/components/pbsclient/config-common.pan b/components/pbsclient/config-common.pan new file mode 100644 index 000000000..ee54543c5 --- /dev/null +++ b/components/pbsclient/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsclient/config-common; + +include { 'components/pbsclient/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsclient'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/pbsclient/config-rpm.pan b/components/pbsclient/config-rpm.pan new file mode 100644 index 000000000..ad760434a --- /dev/null +++ b/components/pbsclient/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsclient/config-rpm; + +include { 'components/pbsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsclient'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-pbsclient','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/pbsclient/config-xml.pan b/components/pbsclient/config-xml.pan new file mode 100644 index 000000000..c12e45711 --- /dev/null +++ b/components/pbsclient/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsclient/config-xml; + +include { 'components/pbsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsclient'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/pbsclient/pbsclient.pm'); diff --git a/components/pbsclient/config.pan b/components/pbsclient/config.pan new file mode 100644 index 000000000..b75eb1ce1 --- /dev/null +++ b/components/pbsclient/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsclient/config; + +include { 'components/pbsclient/config-rpm' }; diff --git a/components/pbsclient/schema.pan b/components/pbsclient/schema.pan new file mode 100644 index 000000000..04be73369 --- /dev/null +++ b/components/pbsclient/schema.pan @@ -0,0 +1,172 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# David Groep +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsclient, 13.1.2, 1, 20131015-1127 + # +# +# Coding style: emulate characters with 4 spaces, thanks! +################################################################################ + + +declaration template components/pbsclient/schema; + +include { 'quattor/schema' }; + +type pbsclient_component_pathmapping_type = { + "locations" : string + "path" : string +}; + +type pbsclient_component_scripts_type = { + "epilogue" ? string + "epilogue.user" ? string + "epilogue.parallel" ? string + "prologue" ? string + "prologue.user" ? string + "prologue.parallel" ? string +}; + +type pbsclient_component_structure_initialisation = { + ## initialisation values + ## regular (see PBSINITIALISATIONVALUES) + ## The expressions start with the variable t (total assigned CPUs) or c (existing CPUs), an operator (+ - / *), and followed by a float constant + "auto_ideal_load" ? string with match (SELF,'^[tc][+-/*]\d+(\.\d+)?') + "auto_max_load" ? string with match (SELF,'^[tc][+-/*]\d+(\.\d+)?') + + "check_poll_time" ? long(0..) + + "checkpoint_interval" ? long + "checkpoint_script" ? string + "checkpoint_run_exe" ? string + + "configversion" ? string + + "cputmult" ? double + + "down_on_error" ? boolean + + "enablemomrestart" ? boolean + + "ideal_load" ? double + + "igncput" ? boolean + "ignmem" ? boolean + "ignvmem" ? boolean + "ignwalltime" ? boolean + + ## octal, hex, or "userdefault" + "job_output_file_mask" ? string + + "log_directory" ? string + "logevent" ? long + "log_file_suffix" ? string + "log_keep_days" ? long(0..) + "loglevel" ? long(0..7) + "log_file_max_size" ? long(0..) + "log_file_roll_depth" ? long(1..) + + "max_conn_timeout_micro_sec" ? long + + "max_load" ? double + + "memory_pressure_threshold" ? double + "memory_pressure_duration" ? long(0..) + + "node_check_script" ? string + "node_check_interval" ? string[] + + "nodefile_suffix" ? string + + "nospool_dir_list" ? string[] + + "prologalarm" ? long + + "rcpcmd" ? string + + "remote_checkpoint_dirs" ? string + + "remote_reconfig" ? boolean + + "restart_script" ? string + + "source_login_batch" ? boolean + "source_login_interactive" ? boolean + + "spool_as_final_name" ? boolean + + "status_update_time" ? long + + "tmpdir" ? string + + "timeout" ? long + + "use_smt" ? boolean + + "wallmult" ? double + + ## camelCase style (legacy) (see PBSINITIALISATIONVALUESMAP) + "cpuTimeMultFactor" ? double + "idealLoad" ? double + "logEvent" ? long + "maxLoad" ? double + "nodeCheckScriptPath" ? string + "nodeCheckIntervalSec" ? long + "prologAlarmSec" ? long + "wallTimeMultFactor" ? double +}; + +type pbsclient_component_structure_options = { + ## other options + 'mom_host' ? string + 'xauthpath' ? string +}; + + +type pbsclient_component_type = { + include structure_component + + "pbsroot" ? string + "configPath" ? string + "initScriptPath" ? string + + ## if behaviour = Torque, first entry of the masters is the $pbsmastername (which is old torque option?) + ## Torque3 uses $pbsserver instead of $clienthost + ## default is ok + "behaviour" ? string = 'OpenPBS' with match (SELF,'OpenPBS|Torque|Torque3') + + "masters" : string[] + "pbsclient" ? string[] + "aliases" ? string[] + "restricted" ? string[] + "cpuinfo" ? string[] + "varattr" ? string[] + + ## Static Resources / Shell Commands / size[fs=] + "resources" ? string[] + + ## $usecp directives + "directPaths" ? pbsclient_component_pathmapping_type[] + + ## prologue and epilogue + "scripts" ? pbsclient_component_scripts_type + + include pbsclient_component_structure_initialisation + + include pbsclient_component_structure_options +}; + + +bind "/software/components/pbsclient" = pbsclient_component_type; diff --git a/components/pbsknownhosts/config-common.pan b/components/pbsknownhosts/config-common.pan new file mode 100644 index 000000000..e8aa278f4 --- /dev/null +++ b/components/pbsknownhosts/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsknownhosts, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsknownhosts/config-common; + +include { 'components/pbsknownhosts/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsknownhosts'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/pbsknownhosts/config-rpm.pan b/components/pbsknownhosts/config-rpm.pan new file mode 100644 index 000000000..bfc7a856e --- /dev/null +++ b/components/pbsknownhosts/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsknownhosts, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsknownhosts/config-rpm; + +include { 'components/pbsknownhosts/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsknownhosts'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-pbsknownhosts','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/pbsknownhosts/config-xml.pan b/components/pbsknownhosts/config-xml.pan new file mode 100644 index 000000000..cc0eefabb --- /dev/null +++ b/components/pbsknownhosts/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsknownhosts, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsknownhosts/config-xml; + +include { 'components/pbsknownhosts/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsknownhosts'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/pbsknownhosts/pbsknownhosts.pm'); diff --git a/components/pbsknownhosts/config.pan b/components/pbsknownhosts/config.pan new file mode 100644 index 000000000..014096f51 --- /dev/null +++ b/components/pbsknownhosts/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsknownhosts, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsknownhosts/config; + +include { 'components/pbsknownhosts/config-rpm' }; diff --git a/components/pbsknownhosts/schema.pan b/components/pbsknownhosts/schema.pan new file mode 100644 index 000000000..f004fdcab --- /dev/null +++ b/components/pbsknownhosts/schema.pan @@ -0,0 +1,39 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsknownhosts, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/pbsknownhosts/schema; + +include { 'quattor/schema' }; + +type pbsknownhosts_component = { + include structure_component + 'configFile' : string = '/opt/edg/etc/edg-pbs-knownhosts.conf' + 'pbsbin' : string = '/usr/bin' + 'nodes' : string = '' + 'keytypes' : string = 'rsa1,rsa,dsa' + 'knownhosts' : string = '/etc/ssh/ssh_known_hosts' + 'knownhostsscript' ? string + 'targets' ? string[] + 'shostsConfigFile' ? string + 'shosts' ? string + 'shostsscript' ? string +}; + +bind '/software/components/pbsknownhosts' = pbsknownhosts_component; diff --git a/components/pbsserver/config-common.pan b/components/pbsserver/config-common.pan new file mode 100644 index 000000000..2062de5f6 --- /dev/null +++ b/components/pbsserver/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsserver, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsserver/config-common; + +include { 'components/pbsserver/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsserver'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/pbsserver/config-rpm.pan b/components/pbsserver/config-rpm.pan new file mode 100644 index 000000000..d212256d4 --- /dev/null +++ b/components/pbsserver/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsserver, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsserver/config-rpm; + +include { 'components/pbsserver/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsserver'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-pbsserver','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/pbsserver/config-xml.pan b/components/pbsserver/config-xml.pan new file mode 100644 index 000000000..ff02dc1d1 --- /dev/null +++ b/components/pbsserver/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsserver, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsserver/config-xml; + +include { 'components/pbsserver/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/pbsserver'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/pbsserver/pbsserver.pm'); diff --git a/components/pbsserver/config.pan b/components/pbsserver/config.pan new file mode 100644 index 000000000..d0052d840 --- /dev/null +++ b/components/pbsserver/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsserver, 13.1.2, 1, 20131015-1127 + # + +unique template components/pbsserver/config; + +include { 'components/pbsserver/config-rpm' }; diff --git a/components/pbsserver/schema.pan b/components/pbsserver/schema.pan new file mode 100644 index 000000000..fb77e6dc7 --- /dev/null +++ b/components/pbsserver/schema.pan @@ -0,0 +1,259 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # pbsserver, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/pbsserver/schema; + +include { 'quattor/schema' }; + +type pbs_server_extended_att = { + 'attribute' : string + 'operator' : string with match(SELF, '^(\+\=|\=|\-\=)$') + 'value' : string +}; + +## from man pbs_server_attributes (NOT the read only ones!) +type pbs_server_attlist = { + 'accounting_keep_days'? long(0..) + + 'acl_group_sloppy' ? boolean + 'acl_host_enable' ? boolean = false + 'acl_hosts' ? string + 'acl_logic_or' ? boolean = false + 'acl_user_enable' ? boolean = false + 'acl_roots' ? string + + 'allow_node_submit' ? boolean = false + 'allow_proxy_user' ? boolean = false + + 'auto_node_np' ? boolean + + 'clone_batch_delay' ? long(0..) + 'clone_batch_size' ? long(1..) + + 'credential_lifetime' ? long(1..) + + 'comment' ? string + + 'default_node' ? string + 'default_queue' ? string + + 'down_on_error' ? boolean + + 'disable_server_id_check' ? boolean + + 'extra_resc' ? string + + 'job_force_cancel_time' ? long(0..) + + 'job_nanny' ? boolean = false + + 'job_start_timeout' ? long(1..) + + 'job_stat_rate' ? long(1..) = 150 + + 'keep_completed' ? long(0..) + + 'kill_delay' ? long(0..) + + 'lock_file' ? string + 'lock_file_check_time' ? long(0..) + 'lock_file_update_time' ? long(0..) + + 'log_events' ? long(0..) + 'log_file_max_size' ? long(0..) = 0 + 'log_file_roll_depth' ? long(1..) = 10 + 'log_keep_days' ? long(0..) + 'log_level' ? long(0..) = 0 + + 'mail_body_fmt' ? string + 'mail_domain' ? string + 'mail_from' ? string + 'mail_subject_fmt' ? string + 'mail_uid' ? long(0..) + + 'managers' ? string + + 'max_job_array_size' ? long(0..) + 'max_slot_limit' ? long(0..) + 'max_running' ? long(0..) + 'max_user_run' ? long(0..) + 'max_group_run' ? long(0..) + + 'mom_job_sync' ? boolean = true + + 'next_job_number' ? long(0..) + + 'node_check_rate' ? long(10..) = 600 + 'node_pack' ? boolean + 'node_ping_rate' ? long(10..) = 300 + 'node_suffix' ? string + + 'np_default' ? long(0..) + + 'operators' ? string + + 'owner_purge' ? boolean + + 'poll_jobs' ? boolean = true + + 'query_other_jobs' ? boolean = false + + ## following does not exist in 3.0.X (should all be like resources_available.) + 'resources_available' ? string + 'resources_available.nodect' ? long(1..) = 2048 + ## following 2 are actually a list of + 'resources_default' ? string + 'resources_default.nodect' ? long(1..) + 'resources_default.nodes' ? long(1..) + 'resources_max' ? string + + 'sched_version' ? string + 'scheduler_iteration' ? long(1..) + 'scheduling' ? boolean + + 'server_name' ? type_hostname + + 'submit_hosts' ? string + + 'tcp_timeout' ? long(1..) = 8 + + 'checkpoint_dir' ? string + + 'moab_array_compatible' ? boolean +}; + +type pbs_server = { + 'manualconfig' : boolean + 'attlist' ? pbs_server_attlist + 'extended_att' ? pbs_server_extended_att[0..] +}; + +type pbs_queue_attlist = { + 'acl_group_enable' ? boolean + 'acl_group_sloppy' ? boolean + 'acl_groups' ? string + 'acl_host_enable' ? boolean + 'acl_hosts' ? string + 'acl_logic_or' ? boolean + 'acl_user_enable' ? boolean + 'acl_users' ? string + + 'alter_router' ? boolean + + 'checkpoint_defaults' ? string + 'checkpoint_min' ? long(0..) + + ## comma-separated list + 'disallowed' ? string + + 'enabled' ? boolean + + 'from_route_only' ? boolean + + 'is_transit' ? boolean + + 'keep_completed' ? long(0..) + + 'kill_delay' ? long(0..) + + 'max_queuable' ? long(1..) + 'max_group_run' ? long(0..) + 'max_user_run' ? long(0..) + 'max_user_queuable' ? long(1..) + 'max_running' ? long(1..) + + 'Priority' ? long(0..) + + 'queue_type' ? string + + 'resources_available.nodect' ? long(1..) = 2048 + 'resources_default.mem' ? string + 'resources_default.neednodes' ? string + 'resources_default.nice' ? long(0..) + 'resources_default.nodect' ? long(1..) + 'resources_default.pmem' ? string + 'resources_default.pvmem' ? string + 'resources_default.vmem' ? string + 'resources_default.walltime' ? string + 'resources_max.cput' ? string + 'resources_max.file' ? string + 'resources_max.mem' ? string + 'resources_max.nice' ? long(1..) + 'resources_max.nodect' ? long(1..) + 'resources_max.pcput' ? string + 'resources_max.pmem' ? string + 'resources_max.pvmem' ? string + 'resources_max.vmem' ? string + 'resources_max.walltime' ? string + 'resources_min.mem' ? string + 'resources_min.nice' ? long(1..) + 'resources_min.pmem' ? string + 'resources_min.pvmem' ? string + 'resources_min.vmem' ? string + + 'started' ? boolean + + 'route_destinations' ? string + 'route_held_jobs' ? boolean + 'route_lifetime' ? long(0..) + 'route_retry_time' ? long(0..) + 'route_waiting_jobs' ? boolean +}; + +type pbs_queue = { + 'manualconfig' : boolean + 'attlist' ? pbs_queue_attlist +}; + +type pbs_queuelist = { + 'manualconfig' : boolean + 'queuelist' ? pbs_queue{} +}; + +type pbs_node_attlist = { + 'np' ? long(1..) + 'properties' ? string + 'state' ? string with match(SELF,'free|down|offline') + 'ntype' ? string +}; + +type pbs_node = { + 'manualconfig' : boolean + 'attlist' ? pbs_node_attlist +}; + +type pbs_nodelist = { + 'manualconfig' : boolean + 'nodelist' ? pbs_node{} +}; + +type pbsserver_component = { + include structure_component + 'pbsroot' ? string + 'binpath' ? string + 'submitfilter' ? string + 'env' ? string{} + 'server' ? pbs_server + 'queue' ? pbs_queuelist + 'node' ? pbs_nodelist + 'ignoretorquecfg' ? boolean = false +}; + +bind '/software/components/pbsserver' = pbsserver_component; diff --git a/components/php/config-common.pan b/components/php/config-common.pan index 28fa5de8f..8355c3830 100644 --- a/components/php/config-common.pan +++ b/components/php/config-common.pan @@ -14,7 +14,7 @@ # # # - # php, 13.9.0, 1, 20130911-1927 + # php, 13.1.2, 1, 20131015-1106 # unique template components/php/config-common; @@ -24,7 +24,7 @@ include { 'components/php/schema' }; # Set prefix to root of component configuration. prefix '/software/components/php'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/php/config-rpm.pan b/components/php/config-rpm.pan index aaf022e5a..914c9ea10 100644 --- a/components/php/config-rpm.pan +++ b/components/php/config-rpm.pan @@ -21,13 +21,13 @@ unique template components/php/config-rpm; include {'components/php/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-php", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-php", "13.1.2-1", "noarch"); "/software/components/php/active" ?= false; "/software/components/php/dispatch" ?= false; -"/software/packages" = pkg_repl("ncm-php", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-php", "13.1.2-1", "noarch"); diff --git a/components/php/config-xml.pan b/components/php/config-xml.pan index 072c2c3fa..a37c3ff9e 100644 --- a/components/php/config-xml.pan +++ b/components/php/config-xml.pan @@ -14,7 +14,7 @@ # # # - # php, 13.9.0, 1, 20130911-1927 + # php, 13.1.2, 1, 20131015-1106 # unique template components/php/config-xml; diff --git a/components/php/config.pan b/components/php/config.pan index 0de03b7e2..0f7403b98 100644 --- a/components/php/config.pan +++ b/components/php/config.pan @@ -14,7 +14,7 @@ # # # - # php, 13.9.0, 1, 20130911-1927 + # php, 13.1.2, 1, 20131015-1106 # unique template components/php/config; diff --git a/components/pine/config-common.pan b/components/pine/config-common.pan index 777cde795..86f7d6f19 100644 --- a/components/pine/config-common.pan +++ b/components/pine/config-common.pan @@ -14,7 +14,7 @@ # # # - # pine, 13.9.0, 1, 20130911-1927 + # pine, 13.1.2, 1, 20131015-1106 # unique template components/pine/config-common; @@ -24,7 +24,7 @@ include { 'components/pine/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pine'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pine/config-rpm.pan b/components/pine/config-rpm.pan index acbf6d2e4..dc1c49baa 100644 --- a/components/pine/config-rpm.pan +++ b/components/pine/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/pine/config-rpm; include {'components/pine/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-pine", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pine", "13.1.2-1", "noarch"); "/software/components/pine/dependencies/pre" ?= list("spma"); diff --git a/components/pine/config-xml.pan b/components/pine/config-xml.pan index 709743076..4266b1f7b 100644 --- a/components/pine/config-xml.pan +++ b/components/pine/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pine, 13.9.0, 1, 20130911-1927 + # pine, 13.1.2, 1, 20131015-1106 # unique template components/pine/config-xml; diff --git a/components/pine/config.pan b/components/pine/config.pan index b6d50fa36..b071bf6fa 100644 --- a/components/pine/config.pan +++ b/components/pine/config.pan @@ -14,7 +14,7 @@ # # # - # pine, 13.9.0, 1, 20130911-1927 + # pine, 13.1.2, 1, 20131015-1106 # unique template components/pine/config; diff --git a/components/pnp4nagios/config-common.pan b/components/pnp4nagios/config-common.pan index 05c853b62..3ac1c338a 100644 --- a/components/pnp4nagios/config-common.pan +++ b/components/pnp4nagios/config-common.pan @@ -14,7 +14,7 @@ # # # - # pnp4nagios, 13.9.0, 1, 20130911-1927 + # pnp4nagios, 13.1.2, 1, 20131015-1106 # unique template components/pnp4nagios/config-common; @@ -24,7 +24,7 @@ include { 'components/pnp4nagios/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pnp4nagios'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pnp4nagios/config-rpm.pan b/components/pnp4nagios/config-rpm.pan index f5692c6b3..3966f28d8 100644 --- a/components/pnp4nagios/config-rpm.pan +++ b/components/pnp4nagios/config-rpm.pan @@ -25,7 +25,7 @@ include {'components/pnp4nagios/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-pnp4nagios", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pnp4nagios", "13.1.2-1", "noarch"); "/software/components/pnp4nagios/dependencies/pre" ?= if (exists("/software/components/icinga")) { list ("icinga"); diff --git a/components/pnp4nagios/config-xml.pan b/components/pnp4nagios/config-xml.pan index 0e7ecca13..3b0d46e65 100644 --- a/components/pnp4nagios/config-xml.pan +++ b/components/pnp4nagios/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pnp4nagios, 13.9.0, 1, 20130911-1927 + # pnp4nagios, 13.1.2, 1, 20131015-1106 # unique template components/pnp4nagios/config-xml; diff --git a/components/pnp4nagios/config.pan b/components/pnp4nagios/config.pan index 0715438b2..e2a7e14c3 100644 --- a/components/pnp4nagios/config.pan +++ b/components/pnp4nagios/config.pan @@ -14,7 +14,7 @@ # # # - # pnp4nagios, 13.9.0, 1, 20130911-1927 + # pnp4nagios, 13.1.2, 1, 20131015-1106 # unique template components/pnp4nagios/config; diff --git a/components/portmap/config-common.pan b/components/portmap/config-common.pan index b0eb4c00e..075899d34 100644 --- a/components/portmap/config-common.pan +++ b/components/portmap/config-common.pan @@ -14,7 +14,7 @@ # # # - # portmap, 13.9.0, 1, 20130911-1927 + # portmap, 13.1.2, 1, 20131015-1106 # unique template components/portmap/config-common; @@ -24,7 +24,7 @@ include { 'components/portmap/schema' }; # Set prefix to root of component configuration. prefix '/software/components/portmap'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/portmap/config-rpm.pan b/components/portmap/config-rpm.pan index 5ef5315af..67df11ce0 100644 --- a/components/portmap/config-rpm.pan +++ b/components/portmap/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # portmap, 13.9.0, 1, 20130911-1927 + # portmap, 13.1.2, 1, 20131015-1106 # unique template components/portmap/config-rpm; @@ -25,7 +25,7 @@ include { 'components/portmap/config-common' }; prefix '/software/components/portmap'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-portmap", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-portmap", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/portmap/config-xml.pan b/components/portmap/config-xml.pan index d6c286ec5..5bff27c3d 100644 --- a/components/portmap/config-xml.pan +++ b/components/portmap/config-xml.pan @@ -14,7 +14,7 @@ # # # - # portmap, 13.9.0, 1, 20130911-1927 + # portmap, 13.1.2, 1, 20131015-1106 # unique template components/portmap/config-xml; diff --git a/components/portmap/config.pan b/components/portmap/config.pan index 04d8f3b8f..1ab639193 100644 --- a/components/portmap/config.pan +++ b/components/portmap/config.pan @@ -14,7 +14,7 @@ # # # - # portmap, 13.9.0, 1, 20130911-1927 + # portmap, 13.1.2, 1, 20131015-1106 # unique template components/portmap/config; diff --git a/components/postfix/config-common.pan b/components/postfix/config-common.pan index 468192fd8..2fde0a3e6 100644 --- a/components/postfix/config-common.pan +++ b/components/postfix/config-common.pan @@ -11,7 +11,7 @@ # # # - # postfix, 13.9.0, 1, 20130911-1927 + # postfix, 13.1.2, 1, 20131015-1106 # unique template components/postfix/config-common; diff --git a/components/postfix/config-rpm.pan b/components/postfix/config-rpm.pan index b5c517a18..ef2ed1905 100644 --- a/components/postfix/config-rpm.pan +++ b/components/postfix/config-rpm.pan @@ -11,7 +11,7 @@ # # # - # postfix, 13.9.0, 1, 20130911-1927 + # postfix, 13.1.2, 1, 20131015-1106 # unique template components/postfix/config-rpm; @@ -22,6 +22,6 @@ include { 'components/postfix/config-common' }; prefix '/software/components/postfix'; # Install Quattor configuration module via RPM package. -'/software/packages' = pkg_repl('ncm-postfix','13.9.0-1','noarch'); +'/software/packages' = pkg_repl('ncm-postfix','13.1.2-1','noarch'); 'dependencies/pre' ?= list('spma'); diff --git a/components/postfix/config-xml.pan b/components/postfix/config-xml.pan index 0ce514b2d..7882efb87 100644 --- a/components/postfix/config-xml.pan +++ b/components/postfix/config-xml.pan @@ -11,7 +11,7 @@ # # # - # postfix, 13.9.0, 1, 20130911-1927 + # postfix, 13.1.2, 1, 20131015-1106 # unique template components/postfix/config-xml; diff --git a/components/postfix/config.pan b/components/postfix/config.pan index d59c2485e..261584da6 100644 --- a/components/postfix/config.pan +++ b/components/postfix/config.pan @@ -11,7 +11,7 @@ # # # - # postfix, 13.9.0, 1, 20130911-1927 + # postfix, 13.1.2, 1, 20131015-1106 # unique template components/postfix/config; diff --git a/components/postfix/schema.pan b/components/postfix/schema.pan index ad88e2cb4..eb17325ef 100644 --- a/components/postfix/schema.pan +++ b/components/postfix/schema.pan @@ -11,7 +11,7 @@ # # # - # postfix, 13.9.0, 1, 20130911-1927 + # postfix, 13.1.2, 1, 20131015-1106 # declaration template components/postfix/schema; diff --git a/components/postgresql/config-common.pan b/components/postgresql/config-common.pan index 27484af72..559c090d4 100644 --- a/components/postgresql/config-common.pan +++ b/components/postgresql/config-common.pan @@ -14,7 +14,7 @@ # # # - # postgresql, 13.9.0, 1, 20130911-1927 + # postgresql, 13.1.2, 1, 20131015-1106 # unique template components/postgresql/config-common; @@ -24,7 +24,7 @@ include { 'components/postgresql/schema' }; # Set prefix to root of component configuration. prefix '/software/components/postgresql'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/postgresql/config-rpm.pan b/components/postgresql/config-rpm.pan index 9e5dcb0ad..32f4b590a 100644 --- a/components/postgresql/config-rpm.pan +++ b/components/postgresql/config-rpm.pan @@ -27,7 +27,7 @@ unique template components/postgresql/config-rpm; include {'components/postgresql/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-postgresql", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-postgresql", "13.1.2-1", "noarch"); ## chkconfig is needed because the component can start postgres using the start script diff --git a/components/postgresql/config-xml.pan b/components/postgresql/config-xml.pan index 0f1c243ba..4f66a4180 100644 --- a/components/postgresql/config-xml.pan +++ b/components/postgresql/config-xml.pan @@ -14,7 +14,7 @@ # # # - # postgresql, 13.9.0, 1, 20130911-1927 + # postgresql, 13.1.2, 1, 20131015-1106 # unique template components/postgresql/config-xml; diff --git a/components/postgresql/config.pan b/components/postgresql/config.pan index 433943df4..2e38f995d 100644 --- a/components/postgresql/config.pan +++ b/components/postgresql/config.pan @@ -14,7 +14,7 @@ # # # - # postgresql, 13.9.0, 1, 20130911-1927 + # postgresql, 13.1.2, 1, 20131015-1106 # unique template components/postgresql/config; diff --git a/components/profile/config-common.pan b/components/profile/config-common.pan index 5e33be3d8..2e76226b2 100644 --- a/components/profile/config-common.pan +++ b/components/profile/config-common.pan @@ -11,7 +11,7 @@ # # # - # profile, 13.9.0, 1, 20130911-1927 + # profile, 13.1.2, 1, 20131015-1106 # unique template components/profile/config-common; @@ -21,7 +21,7 @@ include { 'components/profile/schema' }; # Set prefix to root of component configuration. prefix '/software/components/profile'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/profile/config-rpm.pan b/components/profile/config-rpm.pan index cf6e52ef6..6ddf4e4dd 100644 --- a/components/profile/config-rpm.pan +++ b/components/profile/config-rpm.pan @@ -17,8 +17,8 @@ include { 'components/profile/schema' }; include { 'components/profile/functions' }; # Package to install -"/software/packages" = pkg_repl("ncm-profile", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-profile", "13.1.2-1", "noarch"); '/software/components/profile/dependencies/pre' ?= list('spma'); -'/software/components/profile/version' ?= '13.9.0'; +'/software/components/profile/version' ?= '13.1.2'; diff --git a/components/profile/config-xml.pan b/components/profile/config-xml.pan index b548d0865..ca3170447 100644 --- a/components/profile/config-xml.pan +++ b/components/profile/config-xml.pan @@ -11,7 +11,7 @@ # # # - # profile, 13.9.0, 1, 20130911-1927 + # profile, 13.1.2, 1, 20131015-1106 # unique template components/profile/config-xml; diff --git a/components/profile/config.pan b/components/profile/config.pan index 32bfbffee..f10f84a70 100644 --- a/components/profile/config.pan +++ b/components/profile/config.pan @@ -11,7 +11,7 @@ # # # - # profile, 13.9.0, 1, 20130911-1927 + # profile, 13.1.2, 1, 20131015-1106 # unique template components/profile/config; diff --git a/components/pvss/config-common.pan b/components/pvss/config-common.pan index ec99dc499..50c68a92e 100644 --- a/components/pvss/config-common.pan +++ b/components/pvss/config-common.pan @@ -14,7 +14,7 @@ # # # - # pvss, 13.9.0, 1, 20130911-1927 + # pvss, 13.1.2, 1, 20131015-1106 # unique template components/pvss/config-common; @@ -24,7 +24,7 @@ include { 'components/pvss/schema' }; # Set prefix to root of component configuration. prefix '/software/components/pvss'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/pvss/config-rpm.pan b/components/pvss/config-rpm.pan index cf84cdde3..d33a39d35 100644 --- a/components/pvss/config-rpm.pan +++ b/components/pvss/config-rpm.pan @@ -23,4 +23,4 @@ include {'components/pvss/schema'}; #"/software/components/pvss/dependencies/pre" = list("spma"); "/software/components/pvss/active" = true; "/software/components/pvss/dispatch" ?= true; -"/software/packages" = pkg_repl("ncm-pvss", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-pvss", "13.1.2-1", "noarch"); diff --git a/components/pvss/config-xml.pan b/components/pvss/config-xml.pan index 4cf166b18..3c964727a 100644 --- a/components/pvss/config-xml.pan +++ b/components/pvss/config-xml.pan @@ -14,7 +14,7 @@ # # # - # pvss, 13.9.0, 1, 20130911-1927 + # pvss, 13.1.2, 1, 20131015-1106 # unique template components/pvss/config-xml; diff --git a/components/pvss/config.pan b/components/pvss/config.pan index 3bbe3bdaa..71ffe899b 100644 --- a/components/pvss/config.pan +++ b/components/pvss/config.pan @@ -14,7 +14,7 @@ # # # - # pvss, 13.9.0, 1, 20130911-1927 + # pvss, 13.1.2, 1, 20131015-1106 # unique template components/pvss/config; diff --git a/components/raidman/config-common.pan b/components/raidman/config-common.pan index 91ee6e0f2..dba0d18d8 100644 --- a/components/raidman/config-common.pan +++ b/components/raidman/config-common.pan @@ -14,7 +14,7 @@ # # # - # raidman, 13.9.0, 1, 20130911-1927 + # raidman, 13.1.2, 1, 20131015-1106 # unique template components/raidman/config-common; @@ -24,7 +24,7 @@ include { 'components/raidman/schema' }; # Set prefix to root of component configuration. prefix '/software/components/raidman'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/raidman/config-rpm.pan b/components/raidman/config-rpm.pan index acf3453eb..d09dfd77c 100644 --- a/components/raidman/config-rpm.pan +++ b/components/raidman/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # raidman, 13.9.0, 1, 20130911-1927 + # raidman, 13.1.2, 1, 20131015-1106 # unique template components/raidman/config-rpm; @@ -25,7 +25,7 @@ include { 'components/raidman/config-common' }; prefix '/software/components/raidman'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-raidman", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-raidman", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/raidman/config-xml.pan b/components/raidman/config-xml.pan index 36836e934..4105c2302 100644 --- a/components/raidman/config-xml.pan +++ b/components/raidman/config-xml.pan @@ -14,7 +14,7 @@ # # # - # raidman, 13.9.0, 1, 20130911-1927 + # raidman, 13.1.2, 1, 20131015-1106 # unique template components/raidman/config-xml; diff --git a/components/raidman/config.pan b/components/raidman/config.pan index 7db1ee320..8bc8de796 100644 --- a/components/raidman/config.pan +++ b/components/raidman/config.pan @@ -14,7 +14,7 @@ # # # - # raidman, 13.9.0, 1, 20130911-1927 + # raidman, 13.1.2, 1, 20131015-1106 # unique template components/raidman/config; diff --git a/components/raidman/schema.pan b/components/raidman/schema.pan index d8195b796..fe9cecb46 100644 --- a/components/raidman/schema.pan +++ b/components/raidman/schema.pan @@ -14,7 +14,7 @@ # # # - # raidman, 13.9.0, 1, 20130911-1927 + # raidman, 13.1.2, 1, 20131015-1106 # declaration template components/raidman/schema; diff --git a/components/resolver/config-common.pan b/components/resolver/config-common.pan index 5ae66d9ac..5b5af5a22 100644 --- a/components/resolver/config-common.pan +++ b/components/resolver/config-common.pan @@ -14,7 +14,7 @@ # # # - # resolver, 13.9.0, 1, 20130911-1927 + # resolver, 13.1.2, 1, 20131015-1106 # unique template components/resolver/config-common; @@ -24,7 +24,7 @@ include { 'components/resolver/schema' }; # Set prefix to root of component configuration. prefix '/software/components/resolver'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/resolver/config-rpm.pan b/components/resolver/config-rpm.pan index ea561d844..7f71553d8 100644 --- a/components/resolver/config-rpm.pan +++ b/components/resolver/config-rpm.pan @@ -49,8 +49,8 @@ include { 'pan/functions' }; # standard component settings "/software/components/resolver/active" ?= true ; "/software/components/resolver/dispatch" ?= true ; -"/software/components/resolver/version" = '13.9.0'; +"/software/components/resolver/version" = '13.1.2'; #"/software/components/resolver/release" = "2"; -"/software/packages" = pkg_repl("ncm-resolver", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-resolver", "13.1.2-1", "noarch"); diff --git a/components/resolver/config-xml.pan b/components/resolver/config-xml.pan index 59a63f5f9..d9c06a488 100644 --- a/components/resolver/config-xml.pan +++ b/components/resolver/config-xml.pan @@ -14,7 +14,7 @@ # # # - # resolver, 13.9.0, 1, 20130911-1927 + # resolver, 13.1.2, 1, 20131015-1106 # unique template components/resolver/config-xml; diff --git a/components/resolver/config.pan b/components/resolver/config.pan index 569a9f5da..8a8a0b3f1 100644 --- a/components/resolver/config.pan +++ b/components/resolver/config.pan @@ -14,7 +14,7 @@ # # # - # resolver, 13.9.0, 1, 20130911-1927 + # resolver, 13.1.2, 1, 20131015-1106 # unique template components/resolver/config; diff --git a/components/rproxy/config-common.pan b/components/rproxy/config-common.pan index 702fd6fcb..4354b2471 100644 --- a/components/rproxy/config-common.pan +++ b/components/rproxy/config-common.pan @@ -14,7 +14,7 @@ # # # - # rproxy, 13.9.0, 1, 20130911-1927 + # rproxy, 13.1.2, 1, 20131015-1106 # unique template components/rproxy/config-common; @@ -24,7 +24,7 @@ include { 'components/rproxy/schema' }; # Set prefix to root of component configuration. prefix '/software/components/rproxy'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/rproxy/config-rpm.pan b/components/rproxy/config-rpm.pan index d413d7344..d2d011131 100644 --- a/components/rproxy/config-rpm.pan +++ b/components/rproxy/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # rproxy, 13.9.0, 1, 20130911-1927 + # rproxy, 13.1.2, 1, 20131015-1106 # unique template components/rproxy/config-rpm; @@ -25,7 +25,7 @@ include { 'components/rproxy/config-common' }; prefix '/software/components/rproxy'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-rproxy", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-rproxy", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/rproxy/config-xml.pan b/components/rproxy/config-xml.pan index 63c6707fc..5d5907783 100644 --- a/components/rproxy/config-xml.pan +++ b/components/rproxy/config-xml.pan @@ -14,7 +14,7 @@ # # # - # rproxy, 13.9.0, 1, 20130911-1927 + # rproxy, 13.1.2, 1, 20131015-1106 # unique template components/rproxy/config-xml; diff --git a/components/rproxy/config.pan b/components/rproxy/config.pan index 4c5a29064..ecc8a00aa 100644 --- a/components/rproxy/config.pan +++ b/components/rproxy/config.pan @@ -14,7 +14,7 @@ # # # - # rproxy, 13.9.0, 1, 20130911-1927 + # rproxy, 13.1.2, 1, 20131015-1106 # unique template components/rproxy/config; diff --git a/components/rproxy/schema.pan b/components/rproxy/schema.pan index b2e6cca6f..7b43f6f64 100644 --- a/components/rproxy/schema.pan +++ b/components/rproxy/schema.pan @@ -14,7 +14,7 @@ # # # - # rproxy, 13.9.0, 1, 20130911-1927 + # rproxy, 13.1.2, 1, 20131015-1106 # declaration template components/rproxy/schema; diff --git a/components/runlevel/config-common.pan b/components/runlevel/config-common.pan index c5b58d26a..6c98d88a6 100644 --- a/components/runlevel/config-common.pan +++ b/components/runlevel/config-common.pan @@ -14,7 +14,7 @@ # # # - # runlevel, 13.9.0, 1, 20130911-1927 + # runlevel, 13.1.2, 1, 20131015-1106 # unique template components/runlevel/config-common; @@ -24,7 +24,7 @@ include { 'components/runlevel/schema' }; # Set prefix to root of component configuration. prefix '/software/components/runlevel'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/runlevel/config-rpm.pan b/components/runlevel/config-rpm.pan index 6de45b4c7..60dbe82d8 100644 --- a/components/runlevel/config-rpm.pan +++ b/components/runlevel/config-rpm.pan @@ -21,7 +21,7 @@ unique template components/runlevel/config-rpm; include {'components/runlevel/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-runlevel", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-runlevel", "13.1.2-1", "noarch"); "/software/components/runlevel/dependencies/pre" ?= list("spma"); diff --git a/components/runlevel/config-xml.pan b/components/runlevel/config-xml.pan index 67e78b695..f74ea96ee 100644 --- a/components/runlevel/config-xml.pan +++ b/components/runlevel/config-xml.pan @@ -14,7 +14,7 @@ # # # - # runlevel, 13.9.0, 1, 20130911-1927 + # runlevel, 13.1.2, 1, 20131015-1106 # unique template components/runlevel/config-xml; diff --git a/components/runlevel/config.pan b/components/runlevel/config.pan index 129c2a0cc..1d16a24c6 100644 --- a/components/runlevel/config.pan +++ b/components/runlevel/config.pan @@ -14,7 +14,7 @@ # # # - # runlevel, 13.9.0, 1, 20130911-1927 + # runlevel, 13.1.2, 1, 20131015-1106 # unique template components/runlevel/config; diff --git a/components/selinux/config-common.pan b/components/selinux/config-common.pan index f23caf58e..ed9ea4aa3 100644 --- a/components/selinux/config-common.pan +++ b/components/selinux/config-common.pan @@ -14,7 +14,7 @@ # # # - # selinux, 13.9.0, 1, 20130911-1927 + # selinux, 13.1.2, 1, 20131015-1106 # unique template components/selinux/config-common; @@ -24,7 +24,7 @@ include { 'components/selinux/schema' }; # Set prefix to root of component configuration. prefix '/software/components/selinux'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/selinux/config-rpm.pan b/components/selinux/config-rpm.pan index 6d0d7c26a..acef1dc4a 100644 --- a/components/selinux/config-rpm.pan +++ b/components/selinux/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # selinux, 13.9.0, 1, 20130911-1927 + # selinux, 13.1.2, 1, 20131015-1106 # unique template components/selinux/config-rpm; @@ -25,7 +25,7 @@ include { 'components/selinux/config-common' }; prefix '/software/components/selinux'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-selinux", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-selinux", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/selinux/config-xml.pan b/components/selinux/config-xml.pan index 6757c65bf..6011232ee 100644 --- a/components/selinux/config-xml.pan +++ b/components/selinux/config-xml.pan @@ -14,7 +14,7 @@ # # # - # selinux, 13.9.0, 1, 20130911-1927 + # selinux, 13.1.2, 1, 20131015-1106 # unique template components/selinux/config-xml; diff --git a/components/selinux/config.pan b/components/selinux/config.pan index 48a5b9ccc..305889096 100644 --- a/components/selinux/config.pan +++ b/components/selinux/config.pan @@ -14,7 +14,7 @@ # # # - # selinux, 13.9.0, 1, 20130911-1927 + # selinux, 13.1.2, 1, 20131015-1106 # unique template components/selinux/config; diff --git a/components/selinux/schema.pan b/components/selinux/schema.pan index c2304ed2a..75cbc6ae8 100644 --- a/components/selinux/schema.pan +++ b/components/selinux/schema.pan @@ -14,7 +14,7 @@ # # # - # selinux, 13.9.0, 1, 20130911-1927 + # selinux, 13.1.2, 1, 20131015-1106 # declaration template components/selinux/schema; diff --git a/components/sendmail/config-common.pan b/components/sendmail/config-common.pan index be5ff6e63..7841c546b 100644 --- a/components/sendmail/config-common.pan +++ b/components/sendmail/config-common.pan @@ -14,7 +14,7 @@ # # # - # sendmail, 13.9.0, 1, 20130911-1927 + # sendmail, 13.1.2, 1, 20131015-1106 # unique template components/sendmail/config-common; @@ -24,7 +24,7 @@ include { 'components/sendmail/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sendmail'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sendmail/config-rpm.pan b/components/sendmail/config-rpm.pan index a15ccfbbb..052dc4836 100644 --- a/components/sendmail/config-rpm.pan +++ b/components/sendmail/config-rpm.pan @@ -25,7 +25,7 @@ unique template components/sendmail/config-rpm; include { 'components/sendmail/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-sendmail", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sendmail", "13.1.2-1", "noarch"); "/software/components/sendmail/dependencies/pre" ?= list("spma"); diff --git a/components/sendmail/config-xml.pan b/components/sendmail/config-xml.pan index 9e959af7e..6783ee974 100644 --- a/components/sendmail/config-xml.pan +++ b/components/sendmail/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sendmail, 13.9.0, 1, 20130911-1927 + # sendmail, 13.1.2, 1, 20131015-1106 # unique template components/sendmail/config-xml; diff --git a/components/sendmail/config.pan b/components/sendmail/config.pan index 637055f48..01cec745a 100644 --- a/components/sendmail/config.pan +++ b/components/sendmail/config.pan @@ -14,7 +14,7 @@ # # # - # sendmail, 13.9.0, 1, 20130911-1927 + # sendmail, 13.1.2, 1, 20131015-1106 # unique template components/sendmail/config; diff --git a/components/serialclient/config-common.pan b/components/serialclient/config-common.pan index cc77f00e7..53c8042e1 100644 --- a/components/serialclient/config-common.pan +++ b/components/serialclient/config-common.pan @@ -14,7 +14,7 @@ # # # - # serialclient, 13.9.0, 1, 20130911-1927 + # serialclient, 13.1.2, 1, 20131015-1106 # unique template components/serialclient/config-common; @@ -24,7 +24,7 @@ include { 'components/serialclient/schema' }; # Set prefix to root of component configuration. prefix '/software/components/serialclient'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/serialclient/config-rpm.pan b/components/serialclient/config-rpm.pan index 6f573a4a5..c772a50a4 100644 --- a/components/serialclient/config-rpm.pan +++ b/components/serialclient/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # serialclient, 13.9.0, 1, 20130911-1927 + # serialclient, 13.1.2, 1, 20131015-1106 # unique template components/serialclient/config-rpm; @@ -25,7 +25,7 @@ include { 'components/serialclient/config-common' }; prefix '/software/components/serialclient'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-serialclient", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-serialclient", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/serialclient/config-xml.pan b/components/serialclient/config-xml.pan index 5d6b66e98..3783ffd5b 100644 --- a/components/serialclient/config-xml.pan +++ b/components/serialclient/config-xml.pan @@ -14,7 +14,7 @@ # # # - # serialclient, 13.9.0, 1, 20130911-1927 + # serialclient, 13.1.2, 1, 20131015-1106 # unique template components/serialclient/config-xml; diff --git a/components/serialclient/config.pan b/components/serialclient/config.pan index 91c1409d9..5489a6e65 100644 --- a/components/serialclient/config.pan +++ b/components/serialclient/config.pan @@ -14,7 +14,7 @@ # # # - # serialclient, 13.9.0, 1, 20130911-1927 + # serialclient, 13.1.2, 1, 20131015-1106 # unique template components/serialclient/config; diff --git a/components/serialclient/schema.pan b/components/serialclient/schema.pan index b46f2368e..15e8ffed8 100644 --- a/components/serialclient/schema.pan +++ b/components/serialclient/schema.pan @@ -14,7 +14,7 @@ # # # - # serialclient, 13.9.0, 1, 20130911-1927 + # serialclient, 13.1.2, 1, 20131015-1106 # declaration template components/serialclient/schema; diff --git a/components/shorewall/config-common.pan b/components/shorewall/config-common.pan index 48e004591..d01aefb0e 100644 --- a/components/shorewall/config-common.pan +++ b/components/shorewall/config-common.pan @@ -14,7 +14,7 @@ # # # - # shorewall, 13.9.0, 1, 20130911-1927 + # shorewall, 13.1.2, 1, 20131015-1106 # unique template components/shorewall/config-common; @@ -24,7 +24,7 @@ include { 'components/shorewall/schema' }; # Set prefix to root of component configuration. prefix '/software/components/shorewall'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/shorewall/config-rpm.pan b/components/shorewall/config-rpm.pan index 0aa17dd6c..2e0f101aa 100644 --- a/components/shorewall/config-rpm.pan +++ b/components/shorewall/config-rpm.pan @@ -19,10 +19,10 @@ unique template components/shorewall/config-rpm; include { 'components/shorewall/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-shorewall", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-shorewall", "13.1.2-1", "noarch"); -'/software/components/shorewall/version' ?= '13.9.0'; +'/software/components/shorewall/version' ?= '13.1.2'; "/software/components/shorewall/dependencies/pre" ?= list("spma"); "/software/components/shorewall/active" ?= true; diff --git a/components/shorewall/config-xml.pan b/components/shorewall/config-xml.pan index ff57ced76..61fe78f26 100644 --- a/components/shorewall/config-xml.pan +++ b/components/shorewall/config-xml.pan @@ -14,7 +14,7 @@ # # # - # shorewall, 13.9.0, 1, 20130911-1927 + # shorewall, 13.1.2, 1, 20131015-1106 # unique template components/shorewall/config-xml; diff --git a/components/shorewall/config.pan b/components/shorewall/config.pan index 0ddd18eef..376f3973d 100644 --- a/components/shorewall/config.pan +++ b/components/shorewall/config.pan @@ -14,7 +14,7 @@ # # # - # shorewall, 13.9.0, 1, 20130911-1927 + # shorewall, 13.1.2, 1, 20131015-1106 # unique template components/shorewall/config; diff --git a/components/sindes_getcert/config-common.pan b/components/sindes_getcert/config-common.pan index 15555613f..e53902342 100644 --- a/components/sindes_getcert/config-common.pan +++ b/components/sindes_getcert/config-common.pan @@ -14,7 +14,7 @@ # # # - # sindes_getcert, 13.9.0, 1, 20130911-1927 + # sindes_getcert, 13.1.2, 1, 20131015-1106 # unique template components/sindes_getcert/config-common; @@ -24,7 +24,7 @@ include { 'components/sindes_getcert/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sindes_getcert'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sindes_getcert/config-rpm.pan b/components/sindes_getcert/config-rpm.pan index c00a9d244..f2c7846a9 100644 --- a/components/sindes_getcert/config-rpm.pan +++ b/components/sindes_getcert/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/sindes_getcert/config-rpm; include {'components/sindes_getcert/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-sindes_getcert", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sindes_getcert", "13.1.2-1", "noarch"); "/software/components/sindes_getcert/dependencies/pre" ?= list("spma"); diff --git a/components/sindes_getcert/config-xml.pan b/components/sindes_getcert/config-xml.pan index 394cd7c65..a448bd750 100644 --- a/components/sindes_getcert/config-xml.pan +++ b/components/sindes_getcert/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sindes_getcert, 13.9.0, 1, 20130911-1927 + # sindes_getcert, 13.1.2, 1, 20131015-1106 # unique template components/sindes_getcert/config-xml; diff --git a/components/sindes_getcert/config.pan b/components/sindes_getcert/config.pan index fd438678a..524923100 100644 --- a/components/sindes_getcert/config.pan +++ b/components/sindes_getcert/config.pan @@ -14,7 +14,7 @@ # # # - # sindes_getcert, 13.9.0, 1, 20130911-1927 + # sindes_getcert, 13.1.2, 1, 20131015-1106 # unique template components/sindes_getcert/config; diff --git a/components/slocate/config-common.pan b/components/slocate/config-common.pan index 5145e5f03..bbe4a70a4 100644 --- a/components/slocate/config-common.pan +++ b/components/slocate/config-common.pan @@ -14,7 +14,7 @@ # # # - # slocate, 13.9.0, 1, 20130911-1927 + # slocate, 13.1.2, 1, 20131015-1106 # unique template components/slocate/config-common; @@ -24,7 +24,7 @@ include { 'components/slocate/schema' }; # Set prefix to root of component configuration. prefix '/software/components/slocate'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/slocate/config-rpm.pan b/components/slocate/config-rpm.pan index 7c6138ac2..af7de54e8 100644 --- a/components/slocate/config-rpm.pan +++ b/components/slocate/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # slocate, 13.9.0, 1, 20130911-1927 + # slocate, 13.1.2, 1, 20131015-1106 # unique template components/slocate/config-rpm; @@ -25,7 +25,7 @@ include { 'components/slocate/config-common' }; prefix '/software/components/slocate'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-slocate", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-slocate", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/slocate/config-xml.pan b/components/slocate/config-xml.pan index 702fcb3ac..da4efb4a0 100644 --- a/components/slocate/config-xml.pan +++ b/components/slocate/config-xml.pan @@ -14,7 +14,7 @@ # # # - # slocate, 13.9.0, 1, 20130911-1927 + # slocate, 13.1.2, 1, 20131015-1106 # unique template components/slocate/config-xml; diff --git a/components/slocate/config.pan b/components/slocate/config.pan index ba83c78b4..4951eba1d 100644 --- a/components/slocate/config.pan +++ b/components/slocate/config.pan @@ -14,7 +14,7 @@ # # # - # slocate, 13.9.0, 1, 20130911-1927 + # slocate, 13.1.2, 1, 20131015-1106 # unique template components/slocate/config; diff --git a/components/slocate/schema.pan b/components/slocate/schema.pan index 3bbe4794b..cf7da8329 100644 --- a/components/slocate/schema.pan +++ b/components/slocate/schema.pan @@ -14,7 +14,7 @@ # # # - # slocate, 13.9.0, 1, 20130911-1927 + # slocate, 13.1.2, 1, 20131015-1106 # declaration template components/slocate/schema; diff --git a/components/spma/config-common.pan b/components/spma/config-common.pan index 31d9821ca..43b2ccc78 100644 --- a/components/spma/config-common.pan +++ b/components/spma/config-common.pan @@ -14,7 +14,7 @@ # # # - # spma, 13.9.0, 1, 20130911-1927 + # spma, 13.1.2, 1, 20131015-1106 # unique template components/spma/config-common; @@ -24,7 +24,7 @@ include { 'components/spma/schema' }; # Set prefix to root of component configuration. prefix '/software/components/spma'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/spma/config-rpm.pan b/components/spma/config-rpm.pan index 405af4596..92b98cac6 100644 --- a/components/spma/config-rpm.pan +++ b/components/spma/config-rpm.pan @@ -20,7 +20,7 @@ include { 'components/spma/schema' }; include { 'components/spma/functions' }; # Package to install -"/software/packages" = pkg_repl("ncm-spma", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-spma", "13.1.2-1", "noarch"); "/software/components/spma/active" ?= true; diff --git a/components/spma/config-xml.pan b/components/spma/config-xml.pan index 53991ab84..018d49a73 100644 --- a/components/spma/config-xml.pan +++ b/components/spma/config-xml.pan @@ -14,7 +14,7 @@ # # # - # spma, 13.9.0, 1, 20130911-1927 + # spma, 13.1.2, 1, 20131015-1106 # unique template components/spma/config-xml; diff --git a/components/spma/config.pan b/components/spma/config.pan index f1b69992a..e3f25de23 100644 --- a/components/spma/config.pan +++ b/components/spma/config.pan @@ -14,7 +14,7 @@ # # # - # spma, 13.9.0, 1, 20130911-1927 + # spma, 13.1.2, 1, 20131015-1106 # unique template components/spma/config; diff --git a/components/spma/schema.pan b/components/spma/schema.pan index d8511d60c..d9d275fda 100644 --- a/components/spma/schema.pan +++ b/components/spma/schema.pan @@ -26,10 +26,19 @@ include { 'components/spma/functions' }; # ############################################################ +type SOFTWARE_PACKAGE_FLAGS = { + "reboot" ? boolean # "Needs reboot after install ?" + "offprod" ? boolean # "Don't install if node in production ?" + "mandatory" ? boolean # "Mandatory package ?" + "unwanted" ? boolean # "Unwanted package ?" +}; + type SOFTWARE_PACKAGE_REP = string with repository_exists(SELF,"/software/repositories"); type SOFTWARE_PACKAGE = { - "arch" ? string{} # architectures + "arch" : SOFTWARE_PACKAGE_REP{} # architectures + "components" ? string[] # "Depending components" + "flags" ? SOFTWARE_PACKAGE_FLAGS }; type SOFTWARE_REPOSITORY_PACKAGE = { @@ -41,23 +50,13 @@ type SOFTWARE_REPOSITORY_PACKAGE = { type SOFTWARE_REPOSITORY_PROTOCOL = { "name" : string # "Protocol name" "url" : string # "URL for the given protocol" - "cacert" ? string # Path to CA certificate - "clientkey" ? string # Path to client key - "clientcert" ? string # Path to client certificate - "verify" ? boolean # Whether to verify the SSL certificate }; type SOFTWARE_REPOSITORY = { "name" ? string # "Repository name" "owner" ? string # "Contact person (email)" "protocols" ? SOFTWARE_REPOSITORY_PROTOCOL [] - "priority" ? long(1..99) - "enabled" : boolean = true - "gpgcheck" : boolean = false - "includepkgs" ? string[] - "excludepkgs" ? string[] - "skip_if_unavailable" : boolean = false - "proxy" ? type_absoluteURI + "contents" ? SOFTWARE_REPOSITORY_PACKAGE {} {} }; type component_spma_type = { @@ -82,7 +81,6 @@ type component_spma_type = { "proxyport" ? string # proxy port number "proxyrandom" ? string with match (SELF, 'yes|no') # randomize proxyhost "headnode" ? boolean # use head node - "process_obsoletes" : boolean = false }; bind "/software/components/spma" = component_spma_type; diff --git a/components/squid/config-common.pan b/components/squid/config-common.pan index 15b84964a..b28d7ca8a 100644 --- a/components/squid/config-common.pan +++ b/components/squid/config-common.pan @@ -14,7 +14,7 @@ # # # - # squid, 13.9.0, 1, 20130911-1927 + # squid, 13.1.2, 1, 20131015-1106 # unique template components/squid/config-common; @@ -24,7 +24,7 @@ include { 'components/squid/schema' }; # Set prefix to root of component configuration. prefix '/software/components/squid'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/squid/config-rpm.pan b/components/squid/config-rpm.pan index 16e8c3b4c..5013dcae3 100644 --- a/components/squid/config-rpm.pan +++ b/components/squid/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/squid/config-rpm; include {'components/squid/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-squid", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-squid", "13.1.2-1", "noarch"); # Common settings diff --git a/components/squid/config-xml.pan b/components/squid/config-xml.pan index 9914a0ecd..aef112413 100644 --- a/components/squid/config-xml.pan +++ b/components/squid/config-xml.pan @@ -14,7 +14,7 @@ # # # - # squid, 13.9.0, 1, 20130911-1927 + # squid, 13.1.2, 1, 20131015-1106 # unique template components/squid/config-xml; diff --git a/components/squid/config.pan b/components/squid/config.pan index c1e2d4b2a..be7bc9c31 100644 --- a/components/squid/config.pan +++ b/components/squid/config.pan @@ -14,7 +14,7 @@ # # # - # squid, 13.9.0, 1, 20130911-1927 + # squid, 13.1.2, 1, 20131015-1106 # unique template components/squid/config; diff --git a/components/srvtab/config-common.pan b/components/srvtab/config-common.pan index 419a9bf6e..fca95d9ba 100644 --- a/components/srvtab/config-common.pan +++ b/components/srvtab/config-common.pan @@ -14,7 +14,7 @@ # # # - # srvtab, 13.9.0, 1, 20130911-1927 + # srvtab, 13.1.2, 1, 20131015-1106 # unique template components/srvtab/config-common; @@ -24,7 +24,7 @@ include { 'components/srvtab/schema' }; # Set prefix to root of component configuration. prefix '/software/components/srvtab'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/srvtab/config-rpm.pan b/components/srvtab/config-rpm.pan index 55f0608ba..18cde121c 100644 --- a/components/srvtab/config-rpm.pan +++ b/components/srvtab/config-rpm.pan @@ -25,7 +25,7 @@ unique template components/srvtab/config-rpm; include {'components/srvtab/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-srvtab", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-srvtab", "13.1.2-1", "noarch"); "/software/components/srvtab/active" ?= true; diff --git a/components/srvtab/config-xml.pan b/components/srvtab/config-xml.pan index ffef4e983..1ff38f691 100644 --- a/components/srvtab/config-xml.pan +++ b/components/srvtab/config-xml.pan @@ -14,7 +14,7 @@ # # # - # srvtab, 13.9.0, 1, 20130911-1927 + # srvtab, 13.1.2, 1, 20131015-1106 # unique template components/srvtab/config-xml; diff --git a/components/srvtab/config.pan b/components/srvtab/config.pan index e1e1f4c35..b74891661 100644 --- a/components/srvtab/config.pan +++ b/components/srvtab/config.pan @@ -14,7 +14,7 @@ # # # - # srvtab, 13.9.0, 1, 20130911-1927 + # srvtab, 13.1.2, 1, 20131015-1106 # unique template components/srvtab/config; diff --git a/components/ssh/config-common.pan b/components/ssh/config-common.pan index ce27216fe..691f365f4 100644 --- a/components/ssh/config-common.pan +++ b/components/ssh/config-common.pan @@ -14,7 +14,7 @@ # # # - # ssh, 13.9.0, 1, 20130911-1927 + # ssh, 13.1.2, 1, 20131015-1106 # unique template components/ssh/config-common; @@ -24,7 +24,7 @@ include { 'components/ssh/schema' }; # Set prefix to root of component configuration. prefix '/software/components/ssh'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/ssh/config-rpm.pan b/components/ssh/config-rpm.pan index bf27edcbf..535cdb686 100644 --- a/components/ssh/config-rpm.pan +++ b/components/ssh/config-rpm.pan @@ -20,10 +20,10 @@ unique template components/ssh/config-rpm; include { 'components/ssh/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-ssh", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-ssh", "13.1.2-1", "noarch"); -'/software/components/ssh/version' ?= '13.9.0'; +'/software/components/ssh/version' ?= '13.1.2'; "/software/components/ssh/dependencies/pre" ?= list("spma"); "/software/components/ssh/active" ?= true; diff --git a/components/ssh/config-xml.pan b/components/ssh/config-xml.pan index 4aaf92be2..490412f72 100644 --- a/components/ssh/config-xml.pan +++ b/components/ssh/config-xml.pan @@ -14,7 +14,7 @@ # # # - # ssh, 13.9.0, 1, 20130911-1927 + # ssh, 13.1.2, 1, 20131015-1106 # unique template components/ssh/config-xml; diff --git a/components/ssh/config.pan b/components/ssh/config.pan index 171f72adb..245ec9716 100644 --- a/components/ssh/config.pan +++ b/components/ssh/config.pan @@ -14,7 +14,7 @@ # # # - # ssh, 13.9.0, 1, 20130911-1927 + # ssh, 13.1.2, 1, 20131015-1106 # unique template components/ssh/config; diff --git a/components/sshkeys/config-common.pan b/components/sshkeys/config-common.pan index cc4ce9bb9..958f6b296 100644 --- a/components/sshkeys/config-common.pan +++ b/components/sshkeys/config-common.pan @@ -14,7 +14,7 @@ # # # - # sshkeys, 13.9.0, 1, 20130911-1927 + # sshkeys, 13.1.2, 1, 20131015-1106 # unique template components/sshkeys/config-common; @@ -24,7 +24,7 @@ include { 'components/sshkeys/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sshkeys'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sshkeys/config-rpm.pan b/components/sshkeys/config-rpm.pan index 4bfdaaa6e..e1c24141a 100644 --- a/components/sshkeys/config-rpm.pan +++ b/components/sshkeys/config-rpm.pan @@ -20,9 +20,9 @@ unique template components/sshkeys/config-rpm; include { 'components/sshkeys/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-sshkeys", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sshkeys", "13.1.2-1", "noarch"); '/software/components/sshkeys/dependencies/pre' ?= list('spma'); -'/software/components/sshkeys/version' = '13.9.0'; +'/software/components/sshkeys/version' = '13.1.2'; diff --git a/components/sshkeys/config-xml.pan b/components/sshkeys/config-xml.pan index a069059e9..29340edce 100644 --- a/components/sshkeys/config-xml.pan +++ b/components/sshkeys/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sshkeys, 13.9.0, 1, 20130911-1927 + # sshkeys, 13.1.2, 1, 20131015-1106 # unique template components/sshkeys/config-xml; diff --git a/components/sshkeys/config.pan b/components/sshkeys/config.pan index 3241dc1d4..30ee39518 100644 --- a/components/sshkeys/config.pan +++ b/components/sshkeys/config.pan @@ -14,7 +14,7 @@ # # # - # sshkeys, 13.9.0, 1, 20130911-1927 + # sshkeys, 13.1.2, 1, 20131015-1106 # unique template components/sshkeys/config; diff --git a/components/state/config-common.pan b/components/state/config-common.pan index 10c0b8173..7e1816e85 100644 --- a/components/state/config-common.pan +++ b/components/state/config-common.pan @@ -14,7 +14,7 @@ # # # - # state, 13.9.0, 1, 20130911-1927 + # state, 13.1.2, 1, 20131015-1106 # unique template components/state/config-common; @@ -24,7 +24,7 @@ include { 'components/state/schema' }; # Set prefix to root of component configuration. prefix '/software/components/state'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/state/config-rpm.pan b/components/state/config-rpm.pan index 5b1c5eafe..fced5fd49 100644 --- a/components/state/config-rpm.pan +++ b/components/state/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # state, 13.9.0, 1, 20130911-1927 + # state, 13.1.2, 1, 20131015-1106 # unique template components/state/config-rpm; @@ -25,7 +25,7 @@ include { 'components/state/config-common' }; prefix '/software/components/state'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-state", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-state", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/state/config-xml.pan b/components/state/config-xml.pan index 359903fb9..7fdd8dde4 100644 --- a/components/state/config-xml.pan +++ b/components/state/config-xml.pan @@ -14,7 +14,7 @@ # # # - # state, 13.9.0, 1, 20130911-1927 + # state, 13.1.2, 1, 20131015-1106 # unique template components/state/config-xml; diff --git a/components/state/config.pan b/components/state/config.pan index d8210f2f1..4cb419c71 100644 --- a/components/state/config.pan +++ b/components/state/config.pan @@ -14,7 +14,7 @@ # # # - # state, 13.9.0, 1, 20130911-1927 + # state, 13.1.2, 1, 20131015-1106 # unique template components/state/config; diff --git a/components/state/schema.pan b/components/state/schema.pan index b79e0396b..9553145c6 100644 --- a/components/state/schema.pan +++ b/components/state/schema.pan @@ -14,7 +14,7 @@ # # # - # state, 13.9.0, 1, 20130911-1927 + # state, 13.1.2, 1, 20131015-1106 # declaration template components/state/schema; diff --git a/components/sudo/config-common.pan b/components/sudo/config-common.pan index 113254202..ff8c112ee 100644 --- a/components/sudo/config-common.pan +++ b/components/sudo/config-common.pan @@ -14,7 +14,7 @@ # # # - # sudo, 13.9.0, 1, 20130911-1927 + # sudo, 13.1.2, 1, 20131015-1106 # unique template components/sudo/config-common; @@ -24,7 +24,7 @@ include { 'components/sudo/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sudo'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sudo/config-rpm.pan b/components/sudo/config-rpm.pan index ddf262e64..3c474457b 100644 --- a/components/sudo/config-rpm.pan +++ b/components/sudo/config-rpm.pan @@ -20,7 +20,7 @@ include {'components/sudo/functions'}; # Package to install: # Package to install -"/software/packages" = pkg_repl("ncm-sudo", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sudo", "13.1.2-1", "noarch"); # This component should be run after ncm-accounts, if present. "/software/components/sudo/dependencies/pre" = { diff --git a/components/sudo/config-xml.pan b/components/sudo/config-xml.pan index d05145440..59c6c136a 100644 --- a/components/sudo/config-xml.pan +++ b/components/sudo/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sudo, 13.9.0, 1, 20130911-1927 + # sudo, 13.1.2, 1, 20131015-1106 # unique template components/sudo/config-xml; diff --git a/components/sudo/config.pan b/components/sudo/config.pan index 041790098..78d9a7c6b 100644 --- a/components/sudo/config.pan +++ b/components/sudo/config.pan @@ -14,7 +14,7 @@ # # # - # sudo, 13.9.0, 1, 20130911-1927 + # sudo, 13.1.2, 1, 20131015-1106 # unique template components/sudo/config; diff --git a/components/sudo/schema.pan b/components/sudo/schema.pan index 00d44086d..2a8fce5b0 100644 --- a/components/sudo/schema.pan +++ b/components/sudo/schema.pan @@ -46,7 +46,7 @@ type structure_privilege_line = { "user" : string # "User invoking sudo" "run_as" : string # "User the program will run under" "host" : string # "host the command can be run from" - "options" ? string with match (SELF, "^(NOPASSWD:|PASSWD:|NOEXEC:|EXEC:|SETENV:|NOSETENV:|LOG_INPUT:|NOLOG_INPUT:|LOG_OUTPUT:|NOLOG_OUTPUT:)+$") + "options" ? string with match (SELF, "^(PASSWD|NOPASSWD)$") # "Specific options for this command" "cmd" : string # "The command being run" }; diff --git a/components/symlink/config-common.pan b/components/symlink/config-common.pan index 60b220c20..f7434a7f5 100644 --- a/components/symlink/config-common.pan +++ b/components/symlink/config-common.pan @@ -14,7 +14,7 @@ # # # - # symlink, 13.9.0, 1, 20130911-1927 + # symlink, 13.1.2, 1, 20131015-1106 # unique template components/symlink/config-common; @@ -24,7 +24,7 @@ include { 'components/symlink/schema' }; # Set prefix to root of component configuration. prefix '/software/components/symlink'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/symlink/config-rpm.pan b/components/symlink/config-rpm.pan index 98e75c345..e2cd6ef21 100644 --- a/components/symlink/config-rpm.pan +++ b/components/symlink/config-rpm.pan @@ -27,7 +27,7 @@ unique template components/symlink/config-rpm; include { 'components/symlink/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-symlink", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-symlink", "13.1.2-1", "noarch"); "/software/components/symlink/dependencies/pre" ?= list("spma"); diff --git a/components/symlink/config-xml.pan b/components/symlink/config-xml.pan index cc3c5aa76..cc06cb92f 100644 --- a/components/symlink/config-xml.pan +++ b/components/symlink/config-xml.pan @@ -14,7 +14,7 @@ # # # - # symlink, 13.9.0, 1, 20130911-1927 + # symlink, 13.1.2, 1, 20131015-1106 # unique template components/symlink/config-xml; diff --git a/components/symlink/config.pan b/components/symlink/config.pan index 36555a35d..e240c1a66 100644 --- a/components/symlink/config.pan +++ b/components/symlink/config.pan @@ -14,7 +14,7 @@ # # # - # symlink, 13.9.0, 1, 20130911-1927 + # symlink, 13.1.2, 1, 20131015-1106 # unique template components/symlink/config; diff --git a/components/sysconfig/config-common.pan b/components/sysconfig/config-common.pan index 36c8d0ef4..126c66cd3 100644 --- a/components/sysconfig/config-common.pan +++ b/components/sysconfig/config-common.pan @@ -14,7 +14,7 @@ # # # - # sysconfig, 13.9.0, 1, 20130911-1927 + # sysconfig, 13.1.2, 1, 20131015-1106 # unique template components/sysconfig/config-common; @@ -24,7 +24,7 @@ include { 'components/sysconfig/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sysconfig'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sysconfig/config-rpm.pan b/components/sysconfig/config-rpm.pan index 00ec734f4..7b2f520e0 100644 --- a/components/sysconfig/config-rpm.pan +++ b/components/sysconfig/config-rpm.pan @@ -19,8 +19,8 @@ unique template components/sysconfig/config-rpm; include { 'components/sysconfig/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-sysconfig", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sysconfig", "13.1.2-1", "noarch"); '/software/components/sysconfig/dependencies/pre' ?= list('spma'); -'/software/components/sysconfig/version' ?= '13.9.0'; +'/software/components/sysconfig/version' ?= '13.1.2'; diff --git a/components/sysconfig/config-xml.pan b/components/sysconfig/config-xml.pan index b206ecf05..65dbd62ac 100644 --- a/components/sysconfig/config-xml.pan +++ b/components/sysconfig/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sysconfig, 13.9.0, 1, 20130911-1927 + # sysconfig, 13.1.2, 1, 20131015-1106 # unique template components/sysconfig/config-xml; diff --git a/components/sysconfig/config.pan b/components/sysconfig/config.pan index 151f81f87..5c2307ade 100644 --- a/components/sysconfig/config.pan +++ b/components/sysconfig/config.pan @@ -14,7 +14,7 @@ # # # - # sysconfig, 13.9.0, 1, 20130911-1927 + # sysconfig, 13.1.2, 1, 20131015-1106 # unique template components/sysconfig/config; diff --git a/components/sysctl/config-common.pan b/components/sysctl/config-common.pan index ed52fc43c..6972129f4 100644 --- a/components/sysctl/config-common.pan +++ b/components/sysctl/config-common.pan @@ -14,7 +14,7 @@ # # # - # sysctl, 13.9.0, 1, 20130911-1927 + # sysctl, 13.1.2, 1, 20131015-1106 # unique template components/sysctl/config-common; @@ -24,7 +24,7 @@ include { 'components/sysctl/schema' }; # Set prefix to root of component configuration. prefix '/software/components/sysctl'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/sysctl/config-rpm.pan b/components/sysctl/config-rpm.pan index 016161565..2fb748d60 100644 --- a/components/sysctl/config-rpm.pan +++ b/components/sysctl/config-rpm.pan @@ -21,7 +21,7 @@ include { 'components/sysctl/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-sysctl", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-sysctl", "13.1.2-1", "noarch"); "/software/components/sysctl/dependencies/pre" ?= list("spma"); diff --git a/components/sysctl/config-xml.pan b/components/sysctl/config-xml.pan index 33f65abc4..b630f96a4 100644 --- a/components/sysctl/config-xml.pan +++ b/components/sysctl/config-xml.pan @@ -14,7 +14,7 @@ # # # - # sysctl, 13.9.0, 1, 20130911-1927 + # sysctl, 13.1.2, 1, 20131015-1106 # unique template components/sysctl/config-xml; diff --git a/components/sysctl/config.pan b/components/sysctl/config.pan index 735059d14..e0eb52c20 100644 --- a/components/sysctl/config.pan +++ b/components/sysctl/config.pan @@ -14,7 +14,7 @@ # # # - # sysctl, 13.9.0, 1, 20130911-1927 + # sysctl, 13.1.2, 1, 20131015-1106 # unique template components/sysctl/config; diff --git a/components/syslog/config-common.pan b/components/syslog/config-common.pan index cae25ff9c..da274e1ca 100644 --- a/components/syslog/config-common.pan +++ b/components/syslog/config-common.pan @@ -14,7 +14,7 @@ # # # - # syslog, 13.9.0, 1, 20130911-1927 + # syslog, 13.1.2, 1, 20131015-1106 # unique template components/syslog/config-common; @@ -24,7 +24,7 @@ include { 'components/syslog/schema' }; # Set prefix to root of component configuration. prefix '/software/components/syslog'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/syslog/config-rpm.pan b/components/syslog/config-rpm.pan index 85a94354c..e831b61a1 100644 --- a/components/syslog/config-rpm.pan +++ b/components/syslog/config-rpm.pan @@ -19,7 +19,7 @@ unique template components/syslog/config-rpm; include {'components/syslog/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-syslog", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-syslog", "13.1.2-1", "noarch"); "/software/components/syslog/dependencies/pre" ?= list("spma"); diff --git a/components/syslog/config-xml.pan b/components/syslog/config-xml.pan index 1a3aec379..f0d60ac0c 100644 --- a/components/syslog/config-xml.pan +++ b/components/syslog/config-xml.pan @@ -14,7 +14,7 @@ # # # - # syslog, 13.9.0, 1, 20130911-1927 + # syslog, 13.1.2, 1, 20131015-1106 # unique template components/syslog/config-xml; diff --git a/components/syslog/config.pan b/components/syslog/config.pan index 2080fd01f..08e7905ae 100644 --- a/components/syslog/config.pan +++ b/components/syslog/config.pan @@ -14,7 +14,7 @@ # # # - # syslog, 13.9.0, 1, 20130911-1927 + # syslog, 13.1.2, 1, 20131015-1106 # unique template components/syslog/config; diff --git a/components/syslogng/config-common.pan b/components/syslogng/config-common.pan index b34dd7f90..9671e70b8 100644 --- a/components/syslogng/config-common.pan +++ b/components/syslogng/config-common.pan @@ -14,7 +14,7 @@ # # # - # syslogng, 13.9.0, 1, 20130911-1927 + # syslogng, 13.1.2, 1, 20131015-1106 # unique template components/syslogng/config-common; @@ -24,7 +24,7 @@ include { 'components/syslogng/schema' }; # Set prefix to root of component configuration. prefix '/software/components/syslogng'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/syslogng/config-rpm.pan b/components/syslogng/config-rpm.pan index 70bff126d..43f5d56fd 100644 --- a/components/syslogng/config-rpm.pan +++ b/components/syslogng/config-rpm.pan @@ -25,7 +25,7 @@ include {'components/syslogng/schema'}; # Package to install -"/software/packages" = pkg_repl("ncm-syslogng", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-syslogng", "13.1.2-1", "noarch"); "/software/components/syslogng/dependencies/pre" ?= list ("spma"); diff --git a/components/syslogng/config-xml.pan b/components/syslogng/config-xml.pan index bdb517cd4..54fd5bda5 100644 --- a/components/syslogng/config-xml.pan +++ b/components/syslogng/config-xml.pan @@ -14,7 +14,7 @@ # # # - # syslogng, 13.9.0, 1, 20130911-1927 + # syslogng, 13.1.2, 1, 20131015-1106 # unique template components/syslogng/config-xml; diff --git a/components/syslogng/config.pan b/components/syslogng/config.pan index 6e7065599..efdad722a 100644 --- a/components/syslogng/config.pan +++ b/components/syslogng/config.pan @@ -14,7 +14,7 @@ # # # - # syslogng, 13.9.0, 1, 20130911-1927 + # syslogng, 13.1.2, 1, 20131015-1106 # unique template components/syslogng/config; diff --git a/components/tftpd/config-common.pan b/components/tftpd/config-common.pan index d821b2816..58aaaced4 100644 --- a/components/tftpd/config-common.pan +++ b/components/tftpd/config-common.pan @@ -14,7 +14,7 @@ # # # - # tftpd, 13.9.0, 1, 20130911-1927 + # tftpd, 13.1.2, 1, 20131015-1106 # unique template components/tftpd/config-common; @@ -24,7 +24,7 @@ include { 'components/tftpd/schema' }; # Set prefix to root of component configuration. prefix '/software/components/tftpd'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/tftpd/config-rpm.pan b/components/tftpd/config-rpm.pan index 83a188bf9..e299deda7 100644 --- a/components/tftpd/config-rpm.pan +++ b/components/tftpd/config-rpm.pan @@ -34,4 +34,4 @@ include {'components/tftpd/schema'}; "/software/components/tftpd/server" = "/usr/sbin/in.tftpd"; # arguments to be passed to the server "/software/components/tftpd/server_args" = "-s /tftpboot"; -"/software/packages" = pkg_repl("ncm-tftpd", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-tftpd", "13.1.2-1", "noarch"); diff --git a/components/tftpd/config-xml.pan b/components/tftpd/config-xml.pan index 0a8096e54..067cb6fcf 100644 --- a/components/tftpd/config-xml.pan +++ b/components/tftpd/config-xml.pan @@ -14,7 +14,7 @@ # # # - # tftpd, 13.9.0, 1, 20130911-1927 + # tftpd, 13.1.2, 1, 20131015-1106 # unique template components/tftpd/config-xml; diff --git a/components/tftpd/config.pan b/components/tftpd/config.pan index 139c6583a..706d6e31a 100644 --- a/components/tftpd/config.pan +++ b/components/tftpd/config.pan @@ -14,7 +14,7 @@ # # # - # tftpd, 13.9.0, 1, 20130911-1927 + # tftpd, 13.1.2, 1, 20131015-1106 # unique template components/tftpd/config; diff --git a/components/tomcat/config-common.pan b/components/tomcat/config-common.pan index e2605dbb6..ac71d8847 100644 --- a/components/tomcat/config-common.pan +++ b/components/tomcat/config-common.pan @@ -14,7 +14,7 @@ # # # - # tomcat, 13.9.0, 1, 20130911-1927 + # tomcat, 13.1.2, 1, 20131015-1106 # unique template components/tomcat/config-common; @@ -24,7 +24,7 @@ include { 'components/tomcat/schema' }; # Set prefix to root of component configuration. prefix '/software/components/tomcat'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/tomcat/config-rpm.pan b/components/tomcat/config-rpm.pan index b9eeeb489..3a8d8c6a9 100644 --- a/components/tomcat/config-rpm.pan +++ b/components/tomcat/config-rpm.pan @@ -22,10 +22,10 @@ include { 'components/tomcat/schema' }; # Package to install -"/software/packages" = pkg_repl("ncm-tomcat", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-tomcat", "13.1.2-1", "noarch"); -'/software/components/tomcat/version' ?= '13.9.0'; +'/software/components/tomcat/version' ?= '13.1.2'; "/software/components/tomcat/dependencies/pre" ?= list("spma"); "/software/components/tomcat/active" ?= false; diff --git a/components/tomcat/config-xml.pan b/components/tomcat/config-xml.pan index 20defe476..eef7ab7a5 100644 --- a/components/tomcat/config-xml.pan +++ b/components/tomcat/config-xml.pan @@ -14,7 +14,7 @@ # # # - # tomcat, 13.9.0, 1, 20130911-1927 + # tomcat, 13.1.2, 1, 20131015-1106 # unique template components/tomcat/config-xml; diff --git a/components/tomcat/config.pan b/components/tomcat/config.pan index f13cfd2a1..c07c8e0b2 100644 --- a/components/tomcat/config.pan +++ b/components/tomcat/config.pan @@ -14,7 +14,7 @@ # # # - # tomcat, 13.9.0, 1, 20130911-1927 + # tomcat, 13.1.2, 1, 20131015-1106 # unique template components/tomcat/config; diff --git a/components/useraccess/config-common.pan b/components/useraccess/config-common.pan index d5b4448fc..a52534ad5 100644 --- a/components/useraccess/config-common.pan +++ b/components/useraccess/config-common.pan @@ -14,7 +14,7 @@ # # # - # useraccess, 13.9.0, 1, 20130911-1927 + # useraccess, 13.1.2, 1, 20131015-1106 # unique template components/useraccess/config-common; @@ -24,7 +24,7 @@ include { 'components/useraccess/schema' }; # Set prefix to root of component configuration. prefix '/software/components/useraccess'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/useraccess/config-rpm.pan b/components/useraccess/config-rpm.pan index 8c2e96a65..3fef3f353 100644 --- a/components/useraccess/config-rpm.pan +++ b/components/useraccess/config-rpm.pan @@ -19,7 +19,7 @@ include {'components/useraccess/schema'}; # Package to install: # Package to install -"/software/packages" = pkg_repl("ncm-useraccess", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-useraccess", "13.1.2-1", "noarch"); # This component should be run after ncm-accounts, if present. "/software/components/useraccess/dependencies/pre" = { diff --git a/components/useraccess/config-xml.pan b/components/useraccess/config-xml.pan index 900d4f0c2..489372672 100644 --- a/components/useraccess/config-xml.pan +++ b/components/useraccess/config-xml.pan @@ -14,7 +14,7 @@ # # # - # useraccess, 13.9.0, 1, 20130911-1927 + # useraccess, 13.1.2, 1, 20131015-1106 # unique template components/useraccess/config-xml; diff --git a/components/useraccess/config.pan b/components/useraccess/config.pan index 71fd5b4fc..ecea17312 100644 --- a/components/useraccess/config.pan +++ b/components/useraccess/config.pan @@ -14,7 +14,7 @@ # # # - # useraccess, 13.9.0, 1, 20130911-1927 + # useraccess, 13.1.2, 1, 20131015-1106 # unique template components/useraccess/config; diff --git a/components/vomrs/config-common.pan b/components/vomrs/config-common.pan new file mode 100644 index 000000000..4989bcf7d --- /dev/null +++ b/components/vomrs/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Steve Traylen +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomrs, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomrs/config-common; + +include { 'components/vomrs/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomrs'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/vomrs/config-rpm.pan b/components/vomrs/config-rpm.pan new file mode 100644 index 000000000..e98d5d990 --- /dev/null +++ b/components/vomrs/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Steve Traylen +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomrs, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomrs/config-rpm; + +include { 'components/vomrs/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomrs'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-vomrs','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/vomrs/config-xml.pan b/components/vomrs/config-xml.pan new file mode 100644 index 000000000..0b24b7716 --- /dev/null +++ b/components/vomrs/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Steve Traylen +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomrs, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomrs/config-xml; + +include { 'components/vomrs/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomrs'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/vomrs/vomrs.pm'); diff --git a/components/vomrs/config.pan b/components/vomrs/config.pan new file mode 100644 index 000000000..daccecf17 --- /dev/null +++ b/components/vomrs/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Steve Traylen +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomrs, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomrs/config; + +include { 'components/vomrs/config-rpm' }; diff --git a/components/vomrs/schema.pan b/components/vomrs/schema.pan new file mode 100644 index 000000000..eea0b4138 --- /dev/null +++ b/components/vomrs/schema.pan @@ -0,0 +1,62 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Steve Traylen +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomrs, 13.1.2, 1, 20131015-1127 + # +# +############################################################ +# +# type definition components/vomrs +# +# +# +# +# +############################################################ + +declaration template components/vomrs/schema; + +include { 'quattor/schema' }; + +type structure_vomrs_vo = { + "name" : string + "vomrs" ? string{} # Related to vomrs configuration. + "voinfo" ? string{} # Related to VO + "gridorg" ? string{} # Grid Orgnisation Info. + "tomcat" ? string{} # Tomcat Information + "cacert" ? string{} # CA RelatedA + "vomem" ? string{} # VO Membership Related. + "event" ? string{} # Event Notification + "sync" ? string{} # VOMS syncronisation + "db" ? string{} # VOMRS Database details. + "lcg" ? string{} # LCG Registration. + + }; + +type vomrs_component = { + include structure_component + "VOs" : list + "home" : string # VOMRS_LOCATION /opt/vomrs-1.3. + "configure" ? boolean # Should voms_configure be ran ? (default no) + "confscript" : string # Pathc to voms_configure + "confdir" : string # Path to create and use quattor created files. + "vomrssecretdir" ? string + "vo" ? structure_vomrs_vo{} +}; + +bind '/software/components/vomrs' = vomrs_component; + + diff --git a/components/vomsclient/config-common.pan b/components/vomsclient/config-common.pan new file mode 100644 index 000000000..0ca045eea --- /dev/null +++ b/components/vomsclient/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomsclient/config-common; + +include { 'components/vomsclient/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomsclient'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/vomsclient/config-rpm.pan b/components/vomsclient/config-rpm.pan new file mode 100644 index 000000000..f0eda3e0f --- /dev/null +++ b/components/vomsclient/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomsclient/config-rpm; + +include { 'components/vomsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomsclient'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-vomsclient','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/vomsclient/config-xml.pan b/components/vomsclient/config-xml.pan new file mode 100644 index 000000000..3caf71610 --- /dev/null +++ b/components/vomsclient/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomsclient/config-xml; + +include { 'components/vomsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/vomsclient'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/vomsclient/vomsclient.pm'); diff --git a/components/vomsclient/config.pan b/components/vomsclient/config.pan new file mode 100644 index 000000000..4b87c4bbd --- /dev/null +++ b/components/vomsclient/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/vomsclient/config; + +include { 'components/vomsclient/config-rpm' }; diff --git a/components/vomsclient/schema.pan b/components/vomsclient/schema.pan new file mode 100644 index 000000000..604f579b0 --- /dev/null +++ b/components/vomsclient/schema.pan @@ -0,0 +1,45 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # vomsclient, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/vomsclient/schema; + +include { 'quattor/schema' }; +include { 'pan/types' }; + +type structure_vomsclient_voms_info = { + 'name' ? string + 'host' : type_fqdn + 'port' : type_port + 'cert' : string + 'oldcert' ? string + 'DN' ? string + 'issuer' ? string +}; + +type vomsclient_component = { + include structure_component + 'lscfile' ? boolean + 'vomsCertsDir' ? string + 'vomsServersDir' ? string + 'vos' ? structure_vomsclient_voms_info[]{} +}; + +bind '/software/components/vomsclient' = vomsclient_component; + diff --git a/components/wlconfig/config-common.pan b/components/wlconfig/config-common.pan new file mode 100644 index 000000000..1cace375a --- /dev/null +++ b/components/wlconfig/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wlconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/wlconfig/config-common; + +include { 'components/wlconfig/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wlconfig'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/wlconfig/config-rpm.pan b/components/wlconfig/config-rpm.pan new file mode 100644 index 000000000..2fe32898e --- /dev/null +++ b/components/wlconfig/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wlconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/wlconfig/config-rpm; + +include { 'components/wlconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wlconfig'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-wlconfig','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/wlconfig/config-xml.pan b/components/wlconfig/config-xml.pan new file mode 100644 index 000000000..d320f8561 --- /dev/null +++ b/components/wlconfig/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wlconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/wlconfig/config-xml; + +include { 'components/wlconfig/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wlconfig'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/wlconfig/wlconfig.pm'); diff --git a/components/wlconfig/config.pan b/components/wlconfig/config.pan new file mode 100644 index 000000000..2ef798d0d --- /dev/null +++ b/components/wlconfig/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wlconfig, 13.1.2, 1, 20131015-1127 + # + +unique template components/wlconfig/config; + +include { 'components/wlconfig/config-rpm' }; diff --git a/components/wlconfig/schema.pan b/components/wlconfig/schema.pan new file mode 100644 index 000000000..4e0be00f5 --- /dev/null +++ b/components/wlconfig/schema.pan @@ -0,0 +1,103 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Charles Loomis +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wlconfig, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/wlconfig/schema; + +include { 'quattor/schema' }; + +type structure_wl_log = { + 'file' : string + 'level' : long(1..) +}; + +type structure_wl_jobcontroller = { + 'condorSubmit' : string = '${CONDORG_INSTALL_PATH}/bin/condor_submit' + 'condorRemove' : string = '${CONDORG_INSTALL_PATH}/bin/condor_rm' + 'condorQuery' : string = '${CONDORG_INSTALL_PATH}/bin/condor_q' + 'condorSubmitDAG' : string = '${CONDORG_INSTALL_PATH}/bin/condor_submit_dag' + 'condorRelease' : string = '${CONDORG_INSTALL_PATH}/bin/condor_release' + 'container' : long = 1000 + 'submitFile' : string = '${EDG_WL_TMP}/jobcontrol/submit' + 'outputFile' : string = '${EDG_WL_TMP}/jobcontrol/cond' + 'queueFile' : string = '${EDG_WL_TMP}/jobcontrol/queue.fl' + 'lockFile' : string = '${EDG_WL_TMP}/jobcontrol/lock' + 'log' : structure_wl_log = nlist('file', '${EDG_WL_TMP}/jobcontrol/log/events.log', 'level', 5) +}; + +type structure_wl_logmonitor = { + 'jobsPerCondorLog' : long(1..) = 1000 + 'mainLoopDuration' : long(1..) = 10 + 'condorLogDir' : string = '${EDG_WL_TMP}/logmonitor/CondorG.log' + 'condorRecycleDir' : string = '${EDG_WL_TMP}/logmonitor/CondorG.log/recycle' + 'monitorInternalDir' : string = '${EDG_WL_TMP}/logmonitor/internal' + 'idRepositoryName' : string = 'irepository.dat' + 'abortedJobsTimeout' : long(1..) = 600 + 'externalLogFile' : string = '${EDG_WL_TMP}/logmonitor/log/external.log' + 'lockFile' : string = '${EDG_WL_TMP}/logmonitor/lock' + 'log' : structure_wl_log = nlist('file', '${EDG_WL_TMP}/logmonitor/log/events.log', 'level', 5) +}; + +type structure_wl_networkserver = { + 'iiPort' : type_port = 2135 + 'iiTimeout' : long(1..) = 60 + 'iiDN' : string = 'mds-vo-name=local, o=grid' + 'iiHost' : type_hostname + 'grisPort' : type_port = 2135 + 'grisTimeout' : long(1..) = 20 + 'grisDN' : string = 'mds-vo-name=local, o=grid' + 'backLogSize' : long(0..) = 16 + 'listeningPort' : type_port = 7772 + 'masterThreads' : long(0..) = 8 + 'dispatcherThreads' : long(0..) = 8 + 'sandboxStagingPath' : string = '${EDG_WL_TMP}/SandboxDir' + 'quotaManagement' : boolean = false + 'quotaSandboxSize' : long(0..) = 10000000 + 'quotaAdjustment' : boolean = false + 'quotaAdjustmentAmount' : long(0..) = 2000 + 'reservedDiskPercentage' : double = 2.0 with (self>=0.0 && self<=100.0) + 'log' : structure_wl_log = nlist('file', '${EDG_WL_TMP}/networkserver/log/events.log', 'level', 5) + 'DLICatalog' ? string[] + 'RLSCatalog' ? string[] +}; + +type structure_wl_workloadmanager = { + 'pipeDepth' : long(0..) = 1 + 'workerThreads' : long(0..) = 1 + 'dispatcherType' : string = 'filelist' + 'inputFile' : string = '${EDG_WL_TMP}/workload_manager/input.fl' + 'maxRetryCount' : long(1..) = 10 + 'log' : structure_wl_log = nlist('file', '${EDG_WL_TMP}/workload_manager/log/events.log', 'level', 5) +}; + + +type wlconfig_component = { + include structure_component + 'configFile' : string = 'edg_wl.conf' + 'user' : string = '${EDG_WL_USER}' + 'hostProxyFile' : string = '${EDG_WL_TMP}/networkserver/ns.proxy' + 'grisCache' : long(1..) = 1 + 'useCachedResourceInfo' : boolean = true + 'jobController' : structure_wl_jobcontroller = nlist() + 'logMonitor' : structure_wl_logmonitor = nlist() + 'networkServer' : structure_wl_networkserver = nlist() + 'workloadManager' : structure_wl_workloadmanager = nlist() +}; + +bind '/software/components/wlconfig' = wlconfig_component; diff --git a/components/wmsclient/config-common.pan b/components/wmsclient/config-common.pan new file mode 100644 index 000000000..f516a0374 --- /dev/null +++ b/components/wmsclient/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wmsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmsclient/config-common; + +include { 'components/wmsclient/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmsclient'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/wmsclient/config-rpm.pan b/components/wmsclient/config-rpm.pan new file mode 100644 index 000000000..cf08c1d90 --- /dev/null +++ b/components/wmsclient/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wmsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmsclient/config-rpm; + +include { 'components/wmsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmsclient'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-wmsclient','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/wmsclient/config-xml.pan b/components/wmsclient/config-xml.pan new file mode 100644 index 000000000..00e2bbd94 --- /dev/null +++ b/components/wmsclient/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wmsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmsclient/config-xml; + +include { 'components/wmsclient/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmsclient'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/wmsclient/wmsclient.pm'); diff --git a/components/wmsclient/config.pan b/components/wmsclient/config.pan new file mode 100644 index 000000000..88dfd20bd --- /dev/null +++ b/components/wmsclient/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wmsclient, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmsclient/config; + +include { 'components/wmsclient/config-rpm' }; diff --git a/components/wmsclient/schema.pan b/components/wmsclient/schema.pan new file mode 100644 index 000000000..70cc5068a --- /dev/null +++ b/components/wmsclient/schema.pan @@ -0,0 +1,64 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # wmsclient, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/wmsclient/schema; + +include { 'quattor/schema' }; + +type wmsclient_component_mw_ce_attrs = { + 'rank' ? string + 'rankMPI' ? string + 'requirements' ? string +}; + +type wmsclient_component_mw_def_attrs = { + 'defaultSchema' ? string = 'Glue' + 'CEAttrs' ? wmsclient_component_mw_ce_attrs{} + 'defaultVO' ? string = 'unspecified' + 'errorStorage' ? string = '/tmp' + 'loggingDestination' ? string + 'listenerPort' ? type_port = 44000 + 'listenerStorage' ? string = '/tmp' + 'loggingLevel' ? long = 0 + 'loggingSyncTimeout' ? long = 30 + 'loggingTimeout' ? long = 30 + 'NSLoggerLevel' ? long = 0 + 'outputStorage' ? string = '${HOME}/JobOutput' + 'retryCount' ? long = 3 + 'statusLevel' ? long = 0 +}; + +type wmsclient_component_mw_entry = { + 'active' : boolean = true + 'configDir' ? string + 'classAdsHelper' ? string + 'defaultAttrs' ? wmsclient_component_mw_def_attrs +}; + +type wmsclient_component = { + include structure_component + 'edg' ? wmsclient_component_mw_entry + 'glite' ? wmsclient_component_mw_entry + 'wmproxy' ? wmsclient_component_mw_entry +}; + +bind '/software/components/wmsclient' = wmsclient_component; + + diff --git a/components/wmslb/config-common.pan b/components/wmslb/config-common.pan new file mode 100644 index 000000000..aed9772f8 --- /dev/null +++ b/components/wmslb/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Quattor Project +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jerome Pansanel +# + +# # + # wmslb, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmslb/config-common; + +include { 'components/wmslb/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmslb'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/wmslb/config-rpm.pan b/components/wmslb/config-rpm.pan new file mode 100644 index 000000000..defeae70d --- /dev/null +++ b/components/wmslb/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Quattor Project +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jerome Pansanel +# + +# # + # wmslb, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmslb/config-rpm; + +include { 'components/wmslb/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmslb'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-wmslb','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/wmslb/config-xml.pan b/components/wmslb/config-xml.pan new file mode 100644 index 000000000..74ca763b6 --- /dev/null +++ b/components/wmslb/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Quattor Project +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jerome Pansanel +# + +# # + # wmslb, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmslb/config-xml; + +include { 'components/wmslb/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/wmslb'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/wmslb/wmslb.pm'); diff --git a/components/wmslb/config.pan b/components/wmslb/config.pan new file mode 100644 index 000000000..2ea0e5afb --- /dev/null +++ b/components/wmslb/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Quattor Project +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jerome Pansanel +# + +# # + # wmslb, 13.1.2, 1, 20131015-1127 + # + +unique template components/wmslb/config; + +include { 'components/wmslb/config-rpm' }; diff --git a/components/wmslb/schema.pan b/components/wmslb/schema.pan new file mode 100644 index 000000000..1ee49b997 --- /dev/null +++ b/components/wmslb/schema.pan @@ -0,0 +1,397 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Quattor Project +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jerome Pansanel +# + +# # + # wmslb, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/wmslb/schema; + +include { 'quattor/schema' }; + +include { 'pan/types' }; + +type wmslb_component_env = { + 'GLITE_LOCATION' ? string + 'GLITE_LOCATION_LOG' ? string + 'GLITE_LOCATION_TMP' ? string + 'GLITE_LOCATION_VAR' ? string + 'GLITE_LB_TYPE' ? string + 'GLITE_WMS_LOCATION_VAR' ? string + 'GLITE_WMS_TMP' ? string + 'GLITE_WMS_USER' ? string + 'GLITE_WMS_GROUP' ? string + 'GLITE_HOST_CERT' ? string + 'GLITE_HOST_KEY' ? string + 'GLITE_WMS_QUERY_TIMEOUT' : long = 300 + 'GLITE_WMS_WMPROXY_MAX_SERVED_REQUESTS' : long = 50 + 'GLITE_PR_TIMEOUT' : long = 300 + 'GLITE_SD_PLUGIN' : string = 'bdii,rgma' + 'GLITE_HOST_KEY' ? string + 'GLITE_HOST_CERT' ? string + 'GLOBUS_LOCATION' ? string + 'CONDORG_INSTALL_PATH' ? string + 'CONDOR_CONFIG' ? string + 'GLITE_USER' ? string = 'glite' + 'X509_CERT_DIR' ? string = '/opt/grid-security/certificates' + 'X509_VOMS_DIR' ? string = '/opt/grid-security/vomses' + 'MYPROXY_TCP_PORT_RANGE' ? string + 'HOSTNAME' ? string + 'WMS_JOBWRAPPER_TEMPLATE' ? string + 'WMS_LOCATION_USR' ? string + 'WMS_LOCATION_BIN' ? string + 'WMS_LOCATION_ETC' ? string + 'WMS_LOCATION_LIBEXEC' ? string + 'WMS_LOCATION_LOG' ? string + 'WMS_LOCATION_SBIN' ? string + 'WMS_LOCATION_TMP' ? string + 'WMS_LOCATION_VAR' ? string + 'GLITE_WMS_CONFIG_DIR' ? string + 'LCG_GFAL_INFOSYS' ? string + 'LD_LIBRARY_PATH' ? string +}; + +type wmslb_component_service_special_dirs = { + 'perms' : string +}; + +# Used to describe optional service specific configruation files +# built from a template. +type wmslb_component_service_conf_file = { + 'template' : string +}; + +type wmslb_component_service_common = { + 'name' : string + 'workDirs' : string[] = list() + 'specialDirs' ? wmslb_component_service_special_dirs{} + 'confFiles' ? wmslb_component_service_conf_file{} +}; + +type wmslb_component_service_ice_opts = { + 'log_on_file' ? boolean + 'log_on_console' ? boolean + 'listener_port' ? long + 'Input' ? string + 'InputType' ? string + 'logfile' ? string + 'start_poller' ? boolean + 'purge_jobs' ? boolean + 'start_listener' ? boolean + 'start_subscription_updater' ? boolean + 'subscription_update_threshold_time' ? long + 'subscription_duration' ? long + 'poller_delay' ? long + 'poller_status_threshold_time' ? long + 'start_job_killer' ? boolean + 'job_cancellation_threshold_time' ? long + 'start_proxy_renewer' ? boolean + 'start_lease_updater' ? boolean + 'ice_host_cert' ? string + 'ice_host_key' ? string + 'cream_url_prefix' ? string + 'cream_url_postfix' ? string + 'creamdelegation_url_prefix' ? string + 'creamdelegation_url_postfix' ? string + 'cemon_url_prefix' ? string + 'cemon_url_postfix' ? string + 'ice_topic' ? string + 'lease_delta_time' ? long + 'notification_frequency' ? long + 'ice_log_level' ? long + 'listener_enable_authn' ? boolean + 'listener_enable_authz' ? boolean + 'max_logfile_size' ? long + 'max_logfile_rotations' ? long + 'max_ice_threads' ? long + 'persist_dir' ? string + 'soap_timeout' ? long + 'proxy_renewal_frequency' ? long + 'bulk_query_size' ? long + 'lease_update_frequency' ? long + 'max_ice_mem' ? long + 'ice_empty_threshold' ? long +}; + +type wmslb_component_service_ice = { + include wmslb_component_service_common + + 'options' : wmslb_component_service_ice_opts +}; + +type wmslb_component_service_jc_opts = { + 'CondorSubmit' ? string + 'CondorRemove' ? string + 'CondorQuery' ? string + 'CondorRelease' ? string + 'CondorDagman' ? string + + 'SubmitFileDir' ? string + 'OutputFileDir' ? string + 'Input' ? string + 'InputType' ? string + + 'MaximumTimeAllowedForCondorMatch' ? long + 'DagmanMaxPre' ? long + 'LockFile' ? string + 'LogFile' ? string + 'LogLevel' ? long(1..6) + + 'ContainerRefreshThreshold' ? long +}; + +type wmslb_component_service_jc = { + include wmslb_component_service_common + + 'options' : wmslb_component_service_jc_opts +}; + +type wmslb_component_service_lbproxy_opts = { +}; + +type wmslb_component_service_lbproxy = { + include wmslb_component_service_common + + 'options' ? wmslb_component_service_lbproxy_opts +}; + +type wmslb_component_service_lm_opts = { + 'JobsPerCondorLog' ? string + + 'LockFile' ? string + 'LogFile' ? string + 'LogLevel' ? long(1..6) + 'ExternalLogFile' ? string + + 'MainLoopDuration' ? long + + 'CondorLogDir' ? string + 'CondorLogRecycleDir' ? string + 'MonitorInternalDir' ? string + 'IdRepositoryName' ? string + + 'AbortedJobsTimeout' ? long + 'RemoveJobFiles' ? boolean +}; + +type wmslb_component_service_lm = { + include wmslb_component_service_common + + 'options' : wmslb_component_service_lm_opts +}; + +type wmslb_component_service_logger_opts = { +}; + +type wmslb_component_service_logger = { + include wmslb_component_service_common + + 'options' ? wmslb_component_service_logger_opts +}; + +type wmslb_component_service_ns_opts = { + 'II_Port' ? string + 'Gris_Port' ? long + 'II_Timeout' ? long + 'Gris_Timeout' ? long + 'II_DN' ? string + 'Gris_DN' ? string + 'II_Contact' ? string + + 'BacklogSize' ? long + 'ListeningPort' ? long + 'MasterThreads' ? long + 'DispatcherThreads' ? long + 'SandboxStagingPath' ? string + + 'LogFile' ? string + 'LogLevel' ? long(1..6) + + 'EnableQuotaManagement' ? boolean + 'MaxInputSandboxSize' ? long + 'EnableDynamicQuotaAdjustment' ? boolean + 'QuotaAdjustmentAmount' ? long + 'QuotaInsensibleDiskPortion' ? long +}; + +type wmslb_component_service_ns = { + include wmslb_component_service_common + + 'options' : wmslb_component_service_ns_opts +}; + +type wmslb_component_service_wm_opts = { + 'CeMonitorAsyncPort' ? long + 'CeMonitorServices' ? string{} + 'DispatcherType' ? string + 'EnableBulkMM' ? boolean + 'EnableIsmIiGlue13Purchasing' ? boolean + 'EnableIsmIiGlue20Purchasing' ? boolean + 'EnableRecovery' ? boolean + 'ExpiryPeriod' ? long + 'Input' ? string + 'IsmBlackList' ? string + 'IsmDump' ? string + 'IsmIiG2LDAPCEFilterExt' ? string + 'IsmIiG2LDAPSEFilterExt' ? string + 'IsmIiLDAPCEFilterExt' ? string + 'IsmIiPurchasingRate' ? long + 'IsmThreads' ? boolean + 'IsmUpdateRate' ? long + 'JobWrapperTemplateDir' ? string + 'LogFile' ? string + 'LogLevel' ? long(1..6) + 'MaxReplansCount' ? long + 'MatchRetryPeriod' ? long + 'MaxOutputSandboxSize' ? long + 'MaxRetryCount' ? long + 'PropagateToLRMS' ? string + 'QueueSize' ? long + 'ReplanGracePeriod' ? long + 'RuntimeMalloc' ? string + 'SbRetryDifferentProtocols' ? boolean + 'WmsRequirements' ? string + 'WorkerThreads' ? long +}; + +type wmslb_component_service_wm_jw = { + 'file' : string + 'contents' : string +}; + +type wmslb_component_service_wm = { + include wmslb_component_service_common + + 'jobWrapper' ? wmslb_component_service_wm_jw + 'options' : wmslb_component_service_wm_opts +}; + +type wmslb_component_service_wmproxy_loadmonitor_script = { + 'name' : string = '/usr/sbin/glite_wms_wmproxy_load_monitor' +}; + +type wmslb_component_service_wmproxy_loadmonitor_opts = { + 'ThresholdCPULoad1' : long + 'ThresholdCPULoad5' : long + 'ThresholdCPULoad15' : long + 'ThresholdMemUsage' : long + 'ThresholdSwapUsage' : long + 'ThresholdFDNum' : long + 'ThresholdDiskUsage' : long + 'ThresholdFLSize' : long + 'ThresholdFLNum' : long + 'ThresholdJDSize' : long + 'ThresholdJDNum' : long + 'ThresholdFTPConn' : long +}; + +#type component_wmslb_service_wmproxy_operationsloadscripts_opts = { +# 'load1' ? long +# 'load5' ? long +# 'load15' ? long +# 'memusage' ? long +# 'diskusage' ? long +# 'fdnum' ? long +#}; + +type wmslb_component_service_wmproxy_opts = { +# 'ApacheLogLevel' ? string with match(SELF,'emerg|alert|crit|error|warn|notice|info|debug') + 'ArgusAuthz' ? boolean + 'ArgusPepEndpoints' ? string{} + 'AsyncJobStart' ? boolean +# 'DefaultProtocol' ? string + 'EnableServiceDiscovery' ? boolean + 'GridFTPPort' ? long +# 'HTTPSPort' ? long + 'LBLocalLogger' ? string + 'LBServer' ? string + 'LBServiceDiscoveryType' ? string + 'ListMatchRootPath' ? string +# 'ListMatchTimeout' ? long + 'LoadMonitor' : wmslb_component_service_wmproxy_loadmonitor_opts + 'LogFile' ? string + 'LogLevel' ? long(1..6) +# 'LBProxy' ? boolean +# 'MaxInputSandboxSize' ? long + 'MaxServedRequests' ? long + 'MinPerusalTimeInterval' ? long +# 'OperationLoadScripts' ? wmslb_component_service_wmproxy_operationsloadscripts_opts + 'SandboxStagingPath' ? string +# 'SDJRequirements' ? string + 'ServiceDiscoveryInfoValidity' ? long + 'WeightsCacheValidity' ? long +}; + +type wmslb_component_service_wmproxy = { + include wmslb_component_service_common + + 'LoadMonitorScript' : wmslb_component_service_wmproxy_loadmonitor_script + 'options' : wmslb_component_service_wmproxy_opts +}; + +type wmslb_component_service_wmsclient_opts = { + 'ErrorStorage' ? string + 'OutputStorage' ? string + 'ListenerStorage' ? string + 'virtualorganisation' ? string + 'rank' ? string + 'requirements' ? string + 'RetryCount' ? long + 'ShallowRetryCount' ? long + 'WMProxyEndPoints' ? string + 'LBAddress' ? string + 'MyProxyServer' ? string + 'JobProvenance' ? string + 'PerusalFileEnable' ? boolean + 'AllowZippedISB' ? boolean + 'LBServiceDiscoveryType' ? string + 'WMProxyServiceDiscoveryType' ? string +}; + +type wmslb_component_service_wmsclient = { + include wmslb_component_service_common + + 'options' ? wmslb_component_service_wmsclient_opts +}; + +type wmslb_component_common_opts = { + 'LBProxy' ? boolean +}; + +type wmslb_component_services = { + 'ice' ? wmslb_component_service_ice + 'jc' ? wmslb_component_service_jc + 'lbproxy' ? wmslb_component_service_lbproxy + 'logger' ? wmslb_component_service_logger + 'lm' ? wmslb_component_service_lm + 'ns' ? wmslb_component_service_ns + 'wm' ? wmslb_component_service_wm + 'wmproxy' ? wmslb_component_service_wmproxy + 'wmsclient' ? wmslb_component_service_wmsclient +}; + +type wmslb_component = { + include structure_component + + 'confFile' : string = '/opt/glite/etc/glite_wms.conf' + 'env' ? wmslb_component_env + 'envScript' ? string = '/etc/profile.d/glite-wms.sh' + 'services' ? wmslb_component_services + 'common' ? wmslb_component_common_opts + 'workDirDefaultParent' ? string +}; + +bind '/software/components/wmslb' = wmslb_component; diff --git a/components/xen/config-common.pan b/components/xen/config-common.pan index 00cfda614..270f9cb8e 100644 --- a/components/xen/config-common.pan +++ b/components/xen/config-common.pan @@ -14,7 +14,7 @@ # # # - # xen, 13.9.0, 1, 20130911-1927 + # xen, 13.1.2, 1, 20131015-1106 # unique template components/xen/config-common; @@ -24,7 +24,7 @@ include { 'components/xen/schema' }; # Set prefix to root of component configuration. prefix '/software/components/xen'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/xen/config-rpm.pan b/components/xen/config-rpm.pan index 786f920b3..5d9b8cd00 100644 --- a/components/xen/config-rpm.pan +++ b/components/xen/config-rpm.pan @@ -20,7 +20,7 @@ unique template components/xen/config-rpm; include { "components/xen/schema" }; # Package to install. -"/software/packages" = pkg_repl("ncm-xen", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-xen", "13.1.2-1", "noarch"); # standard component settings diff --git a/components/xen/config-xml.pan b/components/xen/config-xml.pan index b2654997e..deac0ce8f 100644 --- a/components/xen/config-xml.pan +++ b/components/xen/config-xml.pan @@ -14,7 +14,7 @@ # # # - # xen, 13.9.0, 1, 20130911-1927 + # xen, 13.1.2, 1, 20131015-1106 # unique template components/xen/config-xml; diff --git a/components/xen/config.pan b/components/xen/config.pan index d51c324bc..748cef437 100644 --- a/components/xen/config.pan +++ b/components/xen/config.pan @@ -14,7 +14,7 @@ # # # - # xen, 13.9.0, 1, 20130911-1927 + # xen, 13.1.2, 1, 20131015-1106 # unique template components/xen/config; diff --git a/components/xrootd/config-common.pan b/components/xrootd/config-common.pan new file mode 100644 index 000000000..591ab699b --- /dev/null +++ b/components/xrootd/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # xrootd, 13.1.2, 1, 20131015-1127 + # + +unique template components/xrootd/config-common; + +include { 'components/xrootd/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/xrootd'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/xrootd/config-rpm.pan b/components/xrootd/config-rpm.pan new file mode 100644 index 000000000..863448f19 --- /dev/null +++ b/components/xrootd/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # xrootd, 13.1.2, 1, 20131015-1127 + # + +unique template components/xrootd/config-rpm; + +include { 'components/xrootd/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/xrootd'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-xrootd','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/xrootd/config-xml.pan b/components/xrootd/config-xml.pan new file mode 100644 index 000000000..a915789cd --- /dev/null +++ b/components/xrootd/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # xrootd, 13.1.2, 1, 20131015-1127 + # + +unique template components/xrootd/config-xml; + +include { 'components/xrootd/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/xrootd'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/xrootd/xrootd.pm'); diff --git a/components/xrootd/config.pan b/components/xrootd/config.pan new file mode 100644 index 000000000..5a770b6e1 --- /dev/null +++ b/components/xrootd/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # xrootd, 13.1.2, 1, 20131015-1127 + # + +unique template components/xrootd/config; + +include { 'components/xrootd/config-rpm' }; diff --git a/components/xrootd/schema.pan b/components/xrootd/schema.pan new file mode 100644 index 000000000..6e8950290 --- /dev/null +++ b/components/xrootd/schema.pan @@ -0,0 +1,230 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Michel Jouvin +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # xrootd, 13.1.2, 1, 20131015-1127 + # +# + +declaration template components/xrootd/schema; + +include { 'quattor/schema' }; + +# Validation of host configiguration (hosts resource) +function xrootd_component_node_config_valid = { + if ( !is_defined(SELF) ) { + error('Internal error: Xroot host configuration undefined in validation function'); + return(false); + }; + valid_roles = 'disk|redir|fedredir'; + foreach (host;params;SELF) { + foreach (k;v;params) { + if ( k == 'roles' ) { + foreach (i;role;v) { + if ( !match(role,'^('+valid_roles+')$') ) { + error('Invalid role ('+role+') specified for host '+host+' (valid roles='+valid_roles+')'); + return(false); + }; + }; + }; + }; + }; + true; +}; + +# Validation of options +function xrootd_component_options_valid = { + # If token-based authentication is enabled and DPM/Xrootd plugin is + # used, must check that Authz librarie is specified and that + # DPM/Xrootd options principal and authorizedPaths are also present. + if ( is_defined(SELF['tokenAuthz']) ) { + if ( !is_defined(SELF['authzLibraries']) || + !is_defined(SELF['dpm']['principal']) || + !is_defined(SELF['dpm']['authorizedPaths']) ) { + error("DPM/Xrootd plugin with token-based authz enabled requires 'authzLibraries',\n"+ + "'dpm/principal' and 'dpm/authorizedPaths'"); + return(false); + }; + }; + + # Check that federation information is present if a 'fedredir' instance has been + # configured. + if ( is_defined(SELF['xrootdInstances']) ) { + foreach (instance;params;SELF['xrootdInstances']) { + if ( params['type'] == 'fedredir' ) { + if ( !is_defined(SELF['cmsdInstances'][instance]) ) { + error("Missing cmsd instance matching xrootd 'fedredir' instance '"+instance+"'"); + false; + } else if ( !is_defined(params['federation']) ) { + error("'federation' parameter missing for xrootd instance '"+instance+"'"); + false; + } else if ( !is_defined(SELF['federations'][params['federation']]) ) { + error("No information provided for federation '"+params['federation']+"'"); + false; + }; + } else if ( is_defined(params['federation']) ) { + error("'federation' parameter specified for xrootd instance '"+instance+"' (type '"+params['type']+"')"); + false; + }; + }; + }; + if ( is_defined(SELF['cmsdInstances']) ) { + foreach (instance;params;SELF['cmsdInstances']) { + if ( !is_defined(SELF['xrootdInstances'][instance]) ) { + error("Missing xrootd instance matching cmsd instance '"+instance+"'"); + false; + } else if ( !is_defined(params['federation']) ) { + error("'federation' parameter missing for cmsd instance '"+instance+"'"); + false; + }; + }; + }; + + # For federations, check that either n2nLibrary and namePrefix are specified or that + # both are absent. + if ( is_defined(SELF['federations']) ) { + foreach(federation;params;SELF['federations']) { + if ( (is_defined(params['n2nLibrary']) && !is_defined(params['namePrefix'])) || + (!is_defined(params['n2nLibrary']) && is_defined(params['namePrefix'])) ) { + error("Federation '"+federation+"': n2nLibrary and namePrefix must be both specified or absent"); + false; + }; + }; + }; + + true; +}; + + +# Validation of xroot access rules +function xrootd_component_access_rules_valid = { + if ( !is_defined(SELF) ) { + error('Internal error: Xroot access rules undefined in validation function'); + return(false); + }; + + foreach (i;operation_type;list('authenticated','unauthenticated')) { + if ( is_defined(SELF[operation_type]) ) { + foreach (j;operation;SELF[operation_type]) { + if ( !match(operation,'^(delete|read|write|write-once)$') ) { + error('Invalid operation ('+operation+') specified in xroot access rules for '+operation_type+' operations'); + return(false); + }; + }; + }; + }; + true; +}; + +# xrootd authentication plug-in allow to specify operations requiring +# authentication and those allowed without authentication (authentication will be +# used if present). + +type xrootd_component_exported_path = { + # Path is optional: if absent the VO name (nlist key will be used). + # If the path is not starting with '/', will be appended to exportedPathRoot. + 'path' ? string +}; + +type xrootd_component_access_rules = { + 'path' : string + 'authenticated' : string[] + 'unauthenticated' : string[] + 'vo' : string = '*' + 'cert' : string = '*' +} with xrootd_component_access_rules_valid(SELF); + +type xrootd_component_token_authz_options = { + "authzConf" : string = '/etc/grid-security/xrootd/TkAuthz.Authorization' + "tokenPrivateKey" ? string = '/etc/grid-security/xrootd/pvkey.pem' + "tokenPublicKey" ? string = '/etc/grid-security/xrootd/pubkey.pem' + "accessRules" : xrootd_component_access_rules[] + "exportedVOs" : xrootd_component_exported_path{} + "exportedPathRoot" : string +}; + + +# DPM/Xrootd plugin configuration + +type xrootd_component_dpm_options = { + "alternateNames" ? string + "coreMaxSize" ? long + "dpmConnectionRetry" ? long + "dpmHost" : string + "dpnsConnectionRetry" ? long + "dpnsHost" : string + "defaultPrefix" ? string + "replacementPrefix" ? string{} + "mappedFQANs" ? string[] + "authorizedPaths" ? string[] + "principal" ? string +}; + +type xrootd_component_fed_options = { + 'federationCmsdManager' : string + 'federationXrdManager' : string + 'n2nLibrary' ? string + 'namePrefix' ? string + 'localPort' : long + 'localRedirector' : string + 'lfcHost' ? string + 'lfcConnectionRetry' ? long + 'lfcSecurityMechanism' ? string + 'validPathPrefix' ? string + 'redirectParams' ? string + 'localRedirectParams' ? string + "monitoringOptions" ? string + "reportingOptions" ? string +}; + +type xrootd_component_instances = { + "configFile" : string + "federation" ? string + "logFile" : string + "logKeep" : long = 90 + "type" : string with match(SELF,'(disk|redir|fedredir)') +}; + +type xrootd_component_global_options = { + "installDir" ? string + "configDir" : string = 'xrootd' + "authzLibraries" : string[] + "daemonUser" : string + "daemonGroup" : string + "restartServices" : boolean = true + "MonALISAHost" ? string + "monitoringOptions" ? string + "reportingOptions" ? string + "cmsdInstances" ? xrootd_component_instances{} + "xrootdInstances" ? xrootd_component_instances{} + "federations" ? xrootd_component_fed_options{} + "tokenAuthz" ? xrootd_component_token_authz_options + "dpm" ? xrootd_component_dpm_options +} with xrootd_component_options_valid(SELF); + +type xrootd_component_node_config = { + "roles" : string[] +}; + +type xrootd_component = { + include structure_component + + "hosts" : xrootd_component_node_config{} with xrootd_component_node_config_valid(SELF) + "options" : xrootd_component_global_options +}; + +bind "/software/components/xrootd" = xrootd_component; + + diff --git a/components/yaim/config-common.pan b/components/yaim/config-common.pan new file mode 100644 index 000000000..cbf6fd8f8 --- /dev/null +++ b/components/yaim/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Thorsten Kleinwort +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim/config-common; + +include { 'components/yaim/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/yaim/config-rpm.pan b/components/yaim/config-rpm.pan new file mode 100644 index 000000000..7e8df155f --- /dev/null +++ b/components/yaim/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Thorsten Kleinwort +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim/config-rpm; + +include { 'components/yaim/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-yaim','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/yaim/config-xml.pan b/components/yaim/config-xml.pan new file mode 100644 index 000000000..4a3689a64 --- /dev/null +++ b/components/yaim/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Thorsten Kleinwort +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim/config-xml; + +include { 'components/yaim/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/yaim/yaim.pm'); diff --git a/components/yaim/config.pan b/components/yaim/config.pan new file mode 100644 index 000000000..a62411a63 --- /dev/null +++ b/components/yaim/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Thorsten Kleinwort +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim/config; + +include { 'components/yaim/config-rpm' }; diff --git a/components/yaim/schema.pan b/components/yaim/schema.pan new file mode 100644 index 000000000..f7866531b --- /dev/null +++ b/components/yaim/schema.pan @@ -0,0 +1,418 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Thorsten Kleinwort +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim, 13.1.2, 1, 20131015-1127 + # +# +############################################################ +# +# type definition components/yaim +# +# +# +# +# +############################################################ + +declaration template components/yaim/schema; + +include { 'quattor/schema' }; + +type structure_yaim_conf = extensible { + "YAIM_HOME" ? string + "YAIM_SCRIPT" ? string + "YAIM_VERSION" ? string + "USERS_CONF" ? string + "GROUPS_CONF" ? string + + "QUEUES" ? string + "BDII_REGIONS" ? string + + "LCG_REPOSITORY" ? string + "CA_REPOSITORY" ? string + "REPOSITORY_TYPE" ? string + "CE_HOST" ? string + "CLASSIC_HOST" ? string + "RB_HOST" ? string + "PX_HOST" ? string + "BDII_HOST" ? string + "MON_HOST" ? string + "REG_HOST" ? string + "GRID_TRUSTED_BROKERS" ? string + "GRID_ACCEPTED_CREDENTIALS" ? string + "GRID_AUTHORIZED_RENEWERS" ? string + "GRID_DEFAULT_RENEWERS" ? string + "GRID_AUTHORIZED_RETRIEVERS" ? string + "GRID_DEFAULT_RETRIEVERS" ? string + "GRID_AUTHORIZED_KEY_RETRIEVERS" ? string + "GRID_DEFAULT_KEY_RETRIEVERS" ? string + "GRID_TRUSTED_RETRIEVERS" ? string + "GRID_DEFAULT_TRUSTED_RETRIEVERS" ? string + "WN_LIST" ? string + "FUNCTIONS_DIR" ? string + "MYSQL_PASSWORD" ? string + "GRIDICE_SERVER_HOST" ? string + "SITE_EMAIL" ? string + "SITE_SUPPORT_EMAIL" ? string + "SITE_BDII_HOST" ? string + "SITE_NAME" ? string + "SITE_VERSION" ? string + "SITE_HTTP_PROXY" ? string + "INSTALL_DATE" ? string + "INSTALL_ROOT" ? string + "OUTPUT_STORAGE" ? string + "BDII_HTTP_URL" ? string + "DCACHE_ADMIN" ? string + "DCACHE_POOLS" ? string + "DCACHE_PORT_RANGE" ? string + "RESET_DCACHE_CONFIGURATION" ? string + "MY_DOMAIN" ? string + "DPMCONFIG" ? string + "DPMDATA" ? string + "DPMDB_PWD" ? string + "DPMFSIZE" ? string + "DPM_HOST" ? string + "DPMLOGS" ? string + "DPMPOOL" ? string + "DPM_POOLS" ? string + "DPM_PORT_RANGE" ? string + "DPMUSER_PWD" ? string + "DPMMGR" ? string + "DPM_FILESYSTEMS" ? string + "DPM_DB_HOST" ? string + "DPM_DB_USER" ? string + "DPM_DB" ? string + "DPNS_DB" ? string + "DPM_DB_PASSWORD" ? string + "DPM_INFO_USER" ? string + "DPM_INFO_PASS" ? string + "FTS_SERVER_URL" ? string + "GLOBUS_TCP_PORT_RANGE" ? string + "GRIDMAP_AUTH" ? string + "JAVA_LOCATION" ? string + "JOB_MANAGER" ? string + "LFC_HOST" ? string + "SE_TYPE" ? string + "LFC_DB_PASSWORD" ? string + "LFC_DB" ? string + "LFC_DB_HOST" ? string + "LFC_LOCAL" ? string + "LFC_CENTRAL" ? string + "CRON_DIR" ? string + "SITE_LOC" ? string + "SITE_LAT" ? string + "SITE_LONG" ? string + "SITE_WEB" ? string + "SITE_TIER" ? string + "SITE_SUPPORT_SITE" ? string + "APEL_DB_PASSWORD" ? string + "VOBOX_HOST" ? string + "VOBOX_PORT" ? string + "GSSKLOG" ? string + "GSSKLOG_SERVER" ? string + "LFC_TYPE" ? string + "LFC_HOST_ALIAS" ? string + "TORQUE_SERVER" ? string + "BATCH_SERVER" ? string + "EDG_WL_SCRATCH" ? string + "BATCH_LOG_DIR" ? string + "BDII_FCR" ? string + "CE_DATADIR" ? string + "CLASSIC_STORAGE_DIR" ? string + "DPMPOOL_NODES" ? string + "RB_RLS" ? string + "SE_ARCH" ? string + "YAIM_VERSION" ? string + "VOMS_HOST" ? string + "BATCH_BIN_DIR" ? string + "BATCH_VERSION" ? string + "BATCH_CONF_DIR" ? string + "RFIO_PORT_RANGE" ? string + "VO_SW_DIR" ? string + "WMS_HOST" ? string + "ORACLE_LOCATION" ? string + "LB_HOST" ? string + "GRIDVIEW_WSDL" ? string + "GLITE_LOCATION" ? string + "USERS_DN_WMS" ? string + "SITE_DESC" ? string + "SITE_SECURITY_EMAIL" ? string + "SITE_OTHER_GRID" ? string + "SITE_OTHER_EGEE_ROC" ? string + "SITE_OTHER_EGEE_SERVICE" ? string + "SITE_OTHER_WLCG_TIER" ? string + "MYSQL_ADMIN" ? string + "NAGIOS_ADMIN_DNS" ? string + "NAGIOS_CGI_ENABLE_CONFIG" ? string + "NAGIOS_HOST" ? string + "NAGIOS_HTTPD_ENABLE_CONFIG" ? string + "NAGIOS_NAGIOS_ENABLE_CONFIG" ? string + "NAGIOS_NCG_ENABLE_CONFIG" ? string + "NAGIOS_NSCA_PASS" ? string + "NAGIOS_ROLE" ? string + "NCG_VO" ? string + "NAGIOS_MYPROXY_NAME" ? string + "NCG_GOCDB_COUNTRY_NAME" ? string + "NCG_GOCDB_ROC_NAME" ? string + "NCG_LDAP_FILTER" ? string + "NCG_NRPE_UI" ? string + "NCG_PROBES_TYPE" ? string + "CEMON_HOST" ? string + "ACCESS_BY_DOMAIN" ? string + "CREAM_DB_USER" ? string + "BLPARSER_HOST" ? string + "BLP_PORT" ? string + "CREAM_PORT" ? string + "BLAH_JOBID_PREFIX" ? string + "CREAM_CE_STATE" ? string + + "WMS_EXPIRY_PERIOD" ? string + "WMS_MATCH_RETRY_PERIOD" ? string + + "GLITE_LB_TYPE" ? string + "GLITE_LB_SUPER_USERS" ? string + "GLITE_LB_RTM_ENABLED" ? string + "GLITE_LB_RTM_DN" ? string + "GRIDFTP_CONNECTIONS_MAX" ? long + + "USE_ARGUS" ? string + "ARGUS_PEPD_ENDPOINTS" ? string + "CREAM_PEPC_RESOURCEID" ? string +}; + +type structure_yaim_close_se = { + "HOST" ? string + "ACCESS_POINT" ? string +}; + +type structure_yaim_ce = { + "closeSE" ? structure_yaim_close_se{} + "BATCH_SYS" ? string + "CAPABILITY" ? string + "CPU_MODEL" ? string + "CPU_VENDOR" ? string + "CPU_SPEED" ? string + "OS" ? string + "OS_RELEASE" ? string + "OS_ARCH" ? string + "OS_VERSION" ? string + "OTHERDESCR" ? string + "MINPHYSMEM" ? string + "MINVIRTMEM" ? string + "SMPSIZE" ? string + "SI00" ? string + "SF00" ? string + "OUTBOUNDIP" ? string + "INBOUNDIP" ? string + "RUNTIMEENV" ? string + "BDII_SITE_TIMEOUT" ? string + "BDII_RESOURCE_TIMEOUT" ? string + "GIP_RESPONSE" ? string + "GIP_FRESHNESS" ? string + "GIP_CACHE_TTL" ? string + "GIP_TIMEOUT" ? string + "PHYSCPU" ? string + "LOGCPU" ? string +}; + +type structure_yaim_fts = { + "HOST_ALIAS" ? string + "DBURL" ? string + "STATS_GENERATION_INTERVAL" ? string + "SUBMIT_VOMS_ATTRIBUTES" ? string + "ADMIN_VOMS_ATTRIBUTES" ? string + "DB_SQLPLUS_CONNECTSTRING" ? string + "DB_USER" ? string + "DB_PASSWORD" ? string + "MSG_ACTIVE" ? string + "MSG_BROKER" ? string + "MSG_COMPLETE" ? string + "MSG_START" ? string + "MSG_CRON" ? string + "MSG_ENABLELOG" ? string + "MSG_ENABLEMSGLOG" ? string + "MSG_PASSWORD" ? string + "MSG_TOPIC" ? string + "MSG_TTL" ? string + "MSG_USERNAME" ? string + "MSG_FQDN" ? string + "MSG_LOGFILEDIR" ? string + "MSG_LOGFILENAME" ? string + "MSG_USE_BROKER_CREDENTIALS" ? string +}; + +type structure_yaim_vomsadmin = { + "INSTALL" ? string + "TOMCAT_GROUP" ? string + "DEPLOY_DATABASE" ? string + "ORACLE_CLIENT" ? string + "SMTP_HOST" ? string + "ORACLE_CONNECTION_STRING" ? string + "DB_HOST" ? string + "WEB_REGISTRATION_DISABLE" ? string +}; + +type structure_yaim_vo_services = { + "SW_DIR" ? string + "DEFAULT_SE" ? string + "SE" ? string + "QUEUES" ? string + "SGM" ? string + "USERS" ? string + "STORAGE_DIR" ? string + "VOMS_SERVERS" ? string + "VOMS_EXTRA_MAPS" ? string + "VOMS_POOL_PATH" ? string + "VOMSES" ? string + "VOMS_CA_DN" ? string + "VOMS_DB_NAME" ? string + "VOMS_PORT" ? string + "VOMS_DB_USER" ? string + "VOMS_CORE_DB_USER" ? string + "VOMS_ADMIN_DB_USER" ? string + "VOMS_CORE_TIMEOUT" ? string + "VOMS_ADMIN_MAIL" ? string + "VOMS_ADMIN_WEB_REGISTRATION_DISABLE" ? string + "VOMS_DB_USER_PASSWORD" ? string + "ORACLE_CONNECTION_STRING" ? string + "VOMS_ADMIN_WEB_REGISTRATION_DISABLE" ? string + "groupsroles" ? string + "UNPRIVILEGED_MKGRIDMAP" ? string + "MAP_WILDCARDS" ? string + "LFC" ? string + "WMS_HOSTS" ? string +}; + +type structure_yaim_scas = { + "SCAS_HOST" ? string + "SCAS_PORT" ? long(1..65534) + "SCAS_CONFIG" ? string + "SCAS_DEBUG_LEVEL" ? long + "SCAS_GROUP" ? string + "SCAS_HOST_CERT" ? string + "SCAS_HOST_KEY" ? string + "SCAS_LCMAPS_CONFIG" ? string + "SCAS_LCMAPS_DEBUG_LEVEL" ? long + "SCAS_LCMAPS_DIR" ? string + "SCAS_LCMAPS_LOG_LEVEL" ? long + "SCAS_LCAS_CONFIG" ? string + "SCAS_LCAS_DEBUG_LEVEL" ? long + "SCAS_LCAS_DIR" ? string + "SCAS_LCAS_LOG_LEVEL" ? long + "SCAS_LOG_DIR" ? string + "SCAS_LOG_FILE" ? string + "SCAS_LOG_LEVEL" ? long + "SCAS_USER" ? string +}; + +type structure_yaim_glexec = { + "GLEXEC_WN_OPMODE" ? string + "GLEXEC_WN_SCAS_ENABLED" ? string + "GLEXEC_WN_ARGUS_ENABLED" ? string + "GLEXEC_WN_LCASLCMAPS_LOG" ? string + "GLEXEC_WN_LCAS_DEBUG_LEVEL" ? long + "GLEXEC_WN_LCAS_DIR" ? string + "GLEXEC_WN_LCAS_CONFIG" ? string + "GLEXEC_WN_LCAS_LOG_LEVEL" ? long + "GLEXEC_WN_LCMAPS_DEBUG_LEVEL" ? long + "GLEXEC_WN_LCMAPS_DIR" ? string + "GLEXEC_WN_LCMAPS_CONFIG" ? string + "GLEXEC_WN_LCMAPS_LOG_LEVEL" ? long + "GLEXEC_WN_LOG_DIR" ? string + "GLEXEC_WN_LOG_FILE" ? string + "GLEXEC_WN_LOG_LEVEL" ? long + "GLEXEC_WN_LOG_DESTINATION" ? string + "PILOT_JOB_FLAG" ? string + "GLEXEC_EXTRA_WHITELIST" ? string + "SCAS_HOST" ? string + "SCAS_PORT" ? long + "SCAS_ENDPOINTS" ? string +}; + +type structure_yaim_vo = { + "name" : string + "auth" ? string[] # was structure_vo_auth[], mandatory + "services" ? structure_yaim_vo_services +}; + +type structure_yaim_argus = { + "ARGUS_HOST" : string + "PAP_ADMIN_DN" : string + "CONFIG_PAP" ? string + "CONFIG_PDP" ? string + "CONFIG_PEP" ? string + "PAP_HOME" ? string + "PAP_ENTITY_ID" ? string + "PAP_HOST" ? string + "PAP_CONF_INI" ? string + "PAP_AUTHZ_INI" ? string + "PAP_ADMIN_PROPS" ? string + "PAP_REPO_LOCATION" ? string + "PAP_POLL_INTERVAL" ? string + "PAP_ORDERING" ? string + "PAP_CONSISTENCY_CHECK" ? string + "PAP_CONSISTENCY_CHECK_REPAIR" ? string + "PAP_PORT" ? string + "PAP_SHUTDOWN_PORT" ? string + "PAP_SHUTDOWN_COMMAND"? string + "PDP_HOME" ? string + "PDP_CONF_INI" ? string + "PDP_ENTITY_ID" ? string + "PDP_HOST" ? string + "PDP_PORT" ? string + "PDP_ADMIN_PORT" ? string + "PDP_ADMIN_PASSWORD" ? string + "PDP_RETENTION_INTERVAL" ? string + "PDP_PAP_ENDPOINTS" ? string + "PEP_HOME" ? string + "PEP_CONF_INI" ? string + "PEP_ENTITY_ID" ? string + "PEP_HOST" ? string + "PEP_PORT" ? string + "PEP_ADMIN_PORT" ? string + "PEP_ADMIN_PASSWORD" ? string + "PEP_MAX_CACHEDRESP" ? string + "PEP_PDP_ENDPOINTS" ? string + +}; + +type yaim_component = { + include structure_component + "configure" ? boolean # Should YAIM itself be run? (default no) + "force" ? boolean = false # force Yaim execution + "require_vos" ? boolean = true # by default, assume VO defs are required + "conf" : structure_yaim_conf + "nodetype" : string[] + "CE" ? structure_yaim_ce + "ARGUS" ? structure_yaim_argus + "FTA" ? string{} + "FTS" ? structure_yaim_fts + "FTM" ? string{} + "SCAS" ? structure_yaim_scas + "GLEXEC" ? structure_yaim_glexec + "extra" ? string{} + "vo" ? structure_yaim_vo{} + "SECRET_PASSWORDS" ? string + "SITE_INFO_DEF_FILE" ? string + "USE_VO_D" ? boolean # store VO config in file per VO under vo.d (default no) + "VOs" ? string[] + + "force_uppercase_variables" : boolean = true # for backward compatibility +}; + +bind "/software/components/yaim" = yaim_component; + + diff --git a/components/yaim_usersconf/config-common.pan b/components/yaim_usersconf/config-common.pan new file mode 100644 index 000000000..257a8e094 --- /dev/null +++ b/components/yaim_usersconf/config-common.pan @@ -0,0 +1,31 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Jan van Eldik +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim_usersconf, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim_usersconf/config-common; + +include { 'components/yaim_usersconf/schema' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim_usersconf'; + +'version' = '13.1.2'; +#'package' = 'NCM::Component'; + +'active' ?= true; +'dispatch' ?= true; diff --git a/components/yaim_usersconf/config-rpm.pan b/components/yaim_usersconf/config-rpm.pan new file mode 100644 index 000000000..8ef568b4e --- /dev/null +++ b/components/yaim_usersconf/config-rpm.pan @@ -0,0 +1,30 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Jan van Eldik +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim_usersconf, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim_usersconf/config-rpm; + +include { 'components/yaim_usersconf/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim_usersconf'; + +# Install Quattor configuration module via RPM package. +'/software/packages' = pkg_repl('ncm-yaim_usersconf','13.1.2-1','noarch'); +'dependencies/pre' ?= list('spma'); + diff --git a/components/yaim_usersconf/config-xml.pan b/components/yaim_usersconf/config-xml.pan new file mode 100644 index 000000000..344ecfa56 --- /dev/null +++ b/components/yaim_usersconf/config-xml.pan @@ -0,0 +1,28 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Jan van Eldik +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim_usersconf, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim_usersconf/config-xml; + +include { 'components/yaim_usersconf/config-common' }; + +# Set prefix to root of component configuration. +prefix '/software/components/yaim_usersconf'; + +# Embed the Quattor configuration module into XML profile. +'code' = file_contents('components/yaim_usersconf/yaim_usersconf.pm'); diff --git a/components/yaim_usersconf/config.pan b/components/yaim_usersconf/config.pan new file mode 100644 index 000000000..d2c169e6a --- /dev/null +++ b/components/yaim_usersconf/config.pan @@ -0,0 +1,22 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Jan van Eldik +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim_usersconf, 13.1.2, 1, 20131015-1127 + # + +unique template components/yaim_usersconf/config; + +include { 'components/yaim_usersconf/config-rpm' }; diff --git a/components/yaim_usersconf/schema.pan b/components/yaim_usersconf/schema.pan new file mode 100644 index 000000000..a2cf4a4be --- /dev/null +++ b/components/yaim_usersconf/schema.pan @@ -0,0 +1,63 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# # +# Current developer(s): +# Jan van Eldik +# + +# # +# Author(s): Jane SMITH, Joe DOE +# + +# # + # yaim_usersconf, 13.1.2, 1, 20131015-1127 + # +# +############################################################ +# +# type definition components/yaim_usersconf +# +# +# +# +# +############################################################ + +declaration template components/yaim_usersconf/schema; + +include { 'quattor/schema' }; + +type structure_yaim_usersconf_gridusers = { + "name" : string + "flag" ? string +}; + +type structure_yaim_usersconf_gridgroups = { + "role" : string # "VOMS path" + "flag" ? string +}; + +type structure_yaim_usersconf_vo = { + "name" : string + "staticusers" ? structure_yaim_usersconf_gridusers[] + "gridusers" ? structure_yaim_usersconf_gridusers[] + "gridgroups" ? structure_yaim_usersconf_gridgroups[] + +}; + +type yaim_usersconf_component = { + include component_type + "users_conf_file" ? string # "location of users.conf file" + "groups_conf_file" ? string # "location of groups.conf file" + "vo" ? structure_yaim_usersconf_vo{} + "usecache" ? boolean + +}; + +bind "/software/components/yaim_usersconf" = yaim_usersconf_component; + + diff --git a/components/zephyrclt/config-common.pan b/components/zephyrclt/config-common.pan index d6bc85b84..53436fdbb 100644 --- a/components/zephyrclt/config-common.pan +++ b/components/zephyrclt/config-common.pan @@ -14,7 +14,7 @@ # # # - # zephyrclt, 13.9.0, 1, 20130911-1927 + # zephyrclt, 13.1.2, 1, 20131015-1106 # unique template components/zephyrclt/config-common; @@ -24,7 +24,7 @@ include { 'components/zephyrclt/schema' }; # Set prefix to root of component configuration. prefix '/software/components/zephyrclt'; -#'version' = '13.9.0'; +#'version' = '13.1.2'; #'package' = 'NCM::Component'; 'active' ?= true; diff --git a/components/zephyrclt/config-rpm.pan b/components/zephyrclt/config-rpm.pan index 77d5fd6ef..521c7894c 100644 --- a/components/zephyrclt/config-rpm.pan +++ b/components/zephyrclt/config-rpm.pan @@ -14,7 +14,7 @@ # # # - # zephyrclt, 13.9.0, 1, 20130911-1927 + # zephyrclt, 13.1.2, 1, 20131015-1106 # unique template components/zephyrclt/config-rpm; @@ -25,7 +25,7 @@ include { 'components/zephyrclt/config-common' }; prefix '/software/components/zephyrclt'; # Install Quattor configuration module via RPM package. -"/software/packages" = pkg_repl("ncm-zephyrclt", "13.9.0-1", "noarch"); +"/software/packages" = pkg_repl("ncm-zephyrclt", "13.1.2-1", "noarch"); 'dependencies/pre' ?= list('spma'); diff --git a/components/zephyrclt/config-xml.pan b/components/zephyrclt/config-xml.pan index 750ad4420..e7d1a36e2 100644 --- a/components/zephyrclt/config-xml.pan +++ b/components/zephyrclt/config-xml.pan @@ -14,7 +14,7 @@ # # # - # zephyrclt, 13.9.0, 1, 20130911-1927 + # zephyrclt, 13.1.2, 1, 20131015-1106 # unique template components/zephyrclt/config-xml; diff --git a/components/zephyrclt/config.pan b/components/zephyrclt/config.pan index 330e8b18d..70b3c82cc 100644 --- a/components/zephyrclt/config.pan +++ b/components/zephyrclt/config.pan @@ -14,7 +14,7 @@ # # # - # zephyrclt, 13.9.0, 1, 20130911-1927 + # zephyrclt, 13.1.2, 1, 20131015-1106 # unique template components/zephyrclt/config; diff --git a/components/zephyrclt/schema.pan b/components/zephyrclt/schema.pan index 97d7ec334..937376160 100644 --- a/components/zephyrclt/schema.pan +++ b/components/zephyrclt/schema.pan @@ -14,7 +14,7 @@ # # # - # zephyrclt, 13.9.0, 1, 20130911-1927 + # zephyrclt, 13.1.2, 1, 20131015-1106 # declaration template components/zephyrclt/schema; diff --git a/quattor/aii/config.pan b/quattor/aii/config.pan new file mode 100644 index 000000000..35431f8c6 --- /dev/null +++ b/quattor/aii/config.pan @@ -0,0 +1,75 @@ +################################################################################ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# ${developer-info +# ${author-info} +# # + # server, 13.1.2, 20131015-1053 + # +# +# This file is the standard aii configuration. It only performs some +# validations, combines information that is already available, and +# set sensible default values. +# +# This file should NOT contain any site or platform customization. +# +################################################################################ + +unique template quattor/aii/config; + +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));}; + +# For convenience +variable AII_DOMAIN ?= value('/system/network/domainname'); +variable AII_HOSTNAME ?= value('/system/network/hostname'); + +# Configure AII plugins +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}; +# Including the PXE generator or equivalent +include { AII_NBP_GEN }; + + + +################################################# +# DHCP daemon configuration (legacy from aii v1) +################################################# + +# +# TFTP server +# This is optional. Only it is necessary if your TFTP server is running on +# a different machine than the DHCP server +# +# "/system/aii/dhcp/options/tftpserver" = "tftp.mydomain.org" +# +variable AII_DHCP_TFTPSERVER ?= null; +"/system/aii/dhcp/options/addoptions" ?= AII_DHCP_TFTPSERVER; + +# +# Additional DHCP options (optional). +# Warning: They will be added in the host declaration of dhcpd.conf file, so +# do not forget the ';' at the end +# +#"/system/aii/dhcp/addoptions" = "options blu-blo-bli bla;"; +# +variable AII_DHCP_ADDOPTIONS ?= null; +"/system/aii/dhcp/options/addoptions" ?= AII_DHCP_ADDOPTIONS; + + +################################### +# End of DHCP daemon configuration +################################### + diff --git a/quattor/aii/dhcp/config.pan b/quattor/aii/dhcp/config.pan index 566c3e75b..2278554b8 100644 --- a/quattor/aii/dhcp/config.pan +++ b/quattor/aii/dhcp/config.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # -# dhcp, 13.9.0, 20130930.1745.17 +# dhcp, 13.1.2, 20131015.1053.34 # template quattor/aii/dhcp/config; diff --git a/quattor/aii/dhcp/rpms.pan b/quattor/aii/dhcp/rpms.pan index d790d4615..9c425d663 100644 --- a/quattor/aii/dhcp/rpms.pan +++ b/quattor/aii/dhcp/rpms.pan @@ -7,11 +7,11 @@ # ${developer-info # ${author-info} # # -# dhcp, 13.9.0, 20130930.1745.17 +# dhcp, 13.1.2, 20131015.1053.34 # # Template adding aii-dhcp rpm to the configuration unique template quattor/aii/dhcp/rpms; -"/software/packages"=pkg_repl("aii-dhcp","13.9.0-1","noarch"); +"/software/packages"=pkg_repl("aii-dhcp","13.1.2-1","noarch"); diff --git a/quattor/aii/dhcp/schema.pan b/quattor/aii/dhcp/schema.pan index 668fda8ad..fee8ee192 100644 --- a/quattor/aii/dhcp/schema.pan +++ b/quattor/aii/dhcp/schema.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # -# dhcp, 13.9.0, 20130930.1745.17 +# dhcp, 13.1.2, 20131015.1053.34 # unique template quattor/aii/dhcp/schema; diff --git a/quattor/aii/ks/config.pan b/quattor/aii/ks/config.pan index bc94af5c6..fb8626ece 100644 --- a/quattor/aii/ks/config.pan +++ b/quattor/aii/ks/config.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # - # ks, 13.9.0, 20130930.1745.17 + # ks, 13.1.2, 20131015.1053.34 # # Template containing the Kickstart-related configuration and default @@ -319,7 +319,8 @@ variable AII_OSINSTALL_OPTION_FIREWALL ?= null; # default list of packages required for the initial installation # -variable AII_OSINSTALL_PACKAGES ?= list ("openssh", +variable AII_OSINSTALL_PACKAGES ?= list ( + "openssh", "openssh-server", "wget", "perl-URI", @@ -329,7 +330,8 @@ variable AII_OSINSTALL_PACKAGES ?= list ("openssh", "perl-Crypt-SSLeay", "lsof", "perl-IO-String", - "curl"); + "curl", +); "/system/aii/osinstall/ks/packages" ?= AII_OSINSTALL_PACKAGES; @@ -400,15 +402,25 @@ include { debug('KS specific configuration for OS minor release: '+to_string(AII # variable AII_OSINSTALL_BASE_PACKAGES ?= list ( + "perl-Compress-Zlib", "perl-LC", "perl-AppConfig-caf", "perl-Proc-ProcessTable", "perl-IO-String", "perl-CAF", + "perl-parent", + "perl-common-sense", + "perl-JSON-XS", + "perl-GSSAPI", + "perl-libwww-perl", + "perl-CDB_File", + "perl-TeX-Hyphen", + "perl-Text-Reform", + "perl-Text-Autoformat", + "perl-Pod-POM", + "perl-Template-Toolkit", "ccm", - "ncm-template", "ncm-ncd", - "ncm-query", "rpmt-py", "spma", "ncm-spma", diff --git a/quattor/aii/ks/rpms.pan b/quattor/aii/ks/rpms.pan index 43f8ec178..6278dfb60 100644 --- a/quattor/aii/ks/rpms.pan +++ b/quattor/aii/ks/rpms.pan @@ -7,11 +7,11 @@ # ${developer-info # ${author-info} # # - # ks, 13.9.0, 20130930.1745.17 + # ks, 13.1.2, 20131015.1053.34 # # Template adding aii-ks rpm to the configuration unique template quattor/aii/ks/rpms; -"/software/packages"=pkg_repl("aii-ks","13.9.0-1","noarch"); +"/software/packages"=pkg_repl("aii-ks","13.1.2-1","noarch"); diff --git a/quattor/aii/ks/schema.pan b/quattor/aii/ks/schema.pan index 60806d951..9d71cee87 100644 --- a/quattor/aii/ks/schema.pan +++ b/quattor/aii/ks/schema.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # - # ks, 13.9.0, 20130930.1745.17 + # ks, 13.1.2, 20131015.1053.34 # # Structure for the component generating kickstart files. @@ -38,13 +38,6 @@ type structure_ks_ksfirewall = { "ports" : long[] = list (7777) }; -# Information needed for logging into syslog -type structure_ks_logging = { - "host" : type_hostname - "port" : type_port = 514 - "level" ? string with match(SELF, "^(debug|warning|error|critical|info)$") -}; - # Information needed for creating the Kickstart file type structure_ks_ks_info = { "ackurl" : type_absoluteURI @@ -64,7 +57,6 @@ type structure_ks_ks_info = { "lang" : string = "en_US.UTF-8" # If you use more than one languages, mark the default one with "--default=your_lang" "langsupport" ? string [] = list ("en_US.UTF-8") - "logging" ? structure_ks_logging "mouse" ? string "bootproto" : string with match (SELF, "static|dhcp") "keyboard" : string = "us" @@ -82,8 +74,6 @@ 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 - "disabled_repos" : string[] = list() # Additional packages to be installed before the reboot, and # thus, before SPMA runs "extra_packages" ? string[] diff --git a/quattor/aii/ks/variants/fedora14.pan b/quattor/aii/ks/variants/fedora14.pan index ac08d04a1..be7110bf1 100644 --- a/quattor/aii/ks/variants/fedora14.pan +++ b/quattor/aii/ks/variants/fedora14.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # - # ks, 13.9.0, 20130930.1745.17 + # ks, 13.1.2, 20131015.1053.34 # # Template containing OS configuration and default values. diff --git a/quattor/aii/ks/variants/sl6.pan b/quattor/aii/ks/variants/sl6.pan index fe6e052a8..b429dc78d 100644 --- a/quattor/aii/ks/variants/sl6.pan +++ b/quattor/aii/ks/variants/sl6.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # - # ks, 13.9.0, 20130930.1745.17 + # ks, 13.1.2, 20131015.1053.34 # # Template containing OS configuration and default values. diff --git a/quattor/aii/pxelinux/config.pan b/quattor/aii/pxelinux/config.pan index 5a32006f8..3be8a798f 100644 --- a/quattor/aii/pxelinux/config.pan +++ b/quattor/aii/pxelinux/config.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # -# pxelinux, 13.9.0, 20130930.1745.17 +# pxelinux, 13.1.2, 20131015.1053.34 # template quattor/aii/pxelinux/config; diff --git a/quattor/aii/pxelinux/rpms.pan b/quattor/aii/pxelinux/rpms.pan index b69c0bdb3..7c2103406 100644 --- a/quattor/aii/pxelinux/rpms.pan +++ b/quattor/aii/pxelinux/rpms.pan @@ -7,11 +7,11 @@ # ${developer-info # ${author-info} # # -# pxelinux, 13.9.0, 20130930.1745.17 +# pxelinux, 13.1.2, 20131015.1053.34 # # Template adding aii-pxelinux rpm to the configuration unique template quattor/aii/pxelinux/rpms; -"/software/packages"=pkg_repl("aii-pxelinux","13.9.0-1","noarch"); +"/software/packages"=pkg_repl("aii-pxelinux","13.1.2-1","noarch"); diff --git a/quattor/aii/pxelinux/schema.pan b/quattor/aii/pxelinux/schema.pan index 76759d2cd..894532085 100644 --- a/quattor/aii/pxelinux/schema.pan +++ b/quattor/aii/pxelinux/schema.pan @@ -7,7 +7,7 @@ # ${developer-info # ${author-info} # # -# pxelinux, 13.9.0, 20130930.1745.17 +# pxelinux, 13.1.2, 20131015.1053.34 # unique template quattor/aii/pxelinux/schema; diff --git a/quattor/aii/rpms.pan b/quattor/aii/rpms.pan new file mode 100644 index 000000000..fc98bd587 --- /dev/null +++ b/quattor/aii/rpms.pan @@ -0,0 +1,17 @@ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# ${developer-info +# ${author-info} +# # + # server, 13.1.2, 20131015-1053 + # + +# Template adding aii-server rpm to the configuration + +unique template quattor/aii/rpms; + +"/software/packages"=pkg_repl("aii-server","13.1.2-1","noarch"); diff --git a/quattor/aii/schema.pan b/quattor/aii/schema.pan new file mode 100644 index 000000000..871dde108 --- /dev/null +++ b/quattor/aii/schema.pan @@ -0,0 +1,15 @@ +################################################################################ +# # +# Software subject to following license(s): +# Apache 2 License (http://www.opensource.org/licenses/apache2.0) +# Copyright (c) Responsible Organization +# + +# ${developer-info +# ${author-info} +# # + # server, 13.1.2, 20131015-1053 + # +unique template quattor/aii/schema; + + diff --git a/quattor/client/rpms.pan b/quattor/client/rpms.pan index 7286d7dd8..35a5c469a 100644 --- a/quattor/client/rpms.pan +++ b/quattor/client/rpms.pan @@ -6,32 +6,32 @@ template quattor/client/rpms; # Used to configure the appropriate repository -variable QUATTOR_RELEASE ?= '13.1-rc'; -variable QUATTOR_PACKAGES_VERSION ?= '13.1-rc_1'; +variable QUATTOR_RELEASE ?= '13.1.2'; +variable QUATTOR_PACKAGES_VERSION ?= QUATTOR_RELEASE; # Quattor services. -"/software/packages"=pkg_repl("ccm",QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("ccm", QUATTOR_PACKAGES_VERSION,"noarch"); "/software/packages"=pkg_repl("cdp-listend",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("spma",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("rpmt-py",QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("spma", "2.1.1-1", "noarch"); +"/software/packages"=pkg_repl("rpmt-py", "1.2.1-1", "noarch"); # NCM components. -"/software/packages"=pkg_repl("ncm-cdispd",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("ncm-ncd",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("ncm-query",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("ncm-template","1.0.17-1","noarch"); +"/software/packages"=pkg_repl("ncm-cdispd", QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("ncm-ncd", QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("ncm-query", QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("ncm-template","1.0.17-1", "noarch"); # Various Quattor supplied dependencies. -"/software/packages"=pkg_repl("perl-AppConfig-caf","1.9.1-1","noarch"); -"/software/packages"=pkg_repl("perl-CAF",QUATTOR_PACKAGES_VERSION,"noarch"); -"/software/packages"=pkg_repl("perl-LC",QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("perl-AppConfig-caf","1.9.1-1", "noarch"); +"/software/packages"=pkg_repl("perl-CAF", QUATTOR_PACKAGES_VERSION,"noarch"); +"/software/packages"=pkg_repl("perl-LC", QUATTOR_PACKAGES_VERSION,"noarch"); # Include RPMs provided by OS. # This is done last to allow redefining some RPMs that may be provided # by the OS if the previous list is not suitable for a specific # version/arch. -variable QUATTOR_CLIENT_OS_INCLUDE = if ( length(OS_NS_QUATTOR) == 0 ) { +variable QUATTOR_CLIENT_OS_INCLUDE ?= if ( length(OS_NS_QUATTOR) == 0 ) { 'pro_software_quattor_client_sl'; } else { 'config/quattor/client';