diff --git a/sql/sitevars-create.sql b/sql/sitevars-create.sql index 4077ab30c9b275f1bd5e0be4ec0e2112c08177c4..934724af362f3e02f5949b20f4abac0de23308b0 100644 --- a/sql/sitevars-create.sql +++ b/sql/sitevars-create.sql @@ -91,6 +91,7 @@ INSERT INTO sitevariables VALUES ('protogeni/allow_externalusers','1','1','When INSERT INTO sitevariables VALUES ('protogeni/max_externalnodes',NULL,'1024','When set, external users may allocate slivers on your testbed.',0); INSERT INTO sitevariables VALUES ('protogeni/cm_uuid','28a10955-aa00-11dd-ad1f-001143e453fe','','The UUID of the local Component Manager.',0); INSERT INTO sitevariables VALUES ('protogeni/max_sliver_lifetime','90','90','The maximum sliver lifetime. When set limits the lifetime of a sliver on your CM. Also see protogeni/max_slice_lifetime.',0); +INSERT INTO sitevariables VALUES ('protogeni/initial_sliver_lifetime','6','6','The initial sliver lifetime. In hours. Also see protogeni/max_sliver_lifetime.',0); INSERT INTO sitevariables VALUES ('protogeni/max_slice_lifetime','90','90','The maximum slice credential lifetime. When set limits the lifetime of a slice credential. Also see protogeni/max_sliver_lifetime.',0); INSERT INTO sitevariables VALUES ('protogeni/default_slice_lifetime','6','6','The default slice credential lifetime. In hours. Also see protogeni/max_slice_lifetime.',0); INSERT INTO sitevariables VALUES ('protogeni/max_components','-1','-1','Maximum number of components that can be allocated. -1 indicates any number of components can be allocated.',0); @@ -118,6 +119,8 @@ INSERT INTO sitevariables VALUES ('protogeni/default_osname','','','The default INSERT INTO sitevariables VALUES ('images/root_password',NULL,'','The encryption hash of the root password to use in the MFSs.',0); INSERT INTO sitevariables VALUES ('protogeni/idlecheck',NULL,'0','When set, do idle checks and send email about idle slices.',0); INSERT INTO sitevariables VALUES ('protogeni/idlecheck_terminate',NULL,'0','When set, do idle checks and terminate idle slices after email warning.',0); +INSERT INTO sitevariables VALUES ('protogeni/idlecheck_norenew',NULL,'0','When set, refuse too allow idle slices to be renewed.',0); +INSERT INTO sitevariables VALUES ('protogeni/idlecheck_threshold',NULL,'3','Number of hours after which a slice is considered idle.',0); INSERT INTO sitevariables VALUES ('protogeni/wrapper_sa_debug_level',NULL,'0','When set, send debugging email for SA wrapper calls',0); INSERT INTO sitevariables VALUES ('protogeni/wrapper_ch_debug_level',NULL,'0','When set, send debugging email for CH wrapper calls',0); INSERT INTO sitevariables VALUES ('protogeni/wrapper_cm_debug_level',NULL,'1','When set, send debugging email for CM wrapper calls',0); diff --git a/sql/updates/4/363 b/sql/updates/4/363 new file mode 100644 index 0000000000000000000000000000000000000000..855cf2ea0dcdbf10d6c93ea17bd7bbc5132e888b --- /dev/null +++ b/sql/updates/4/363 @@ -0,0 +1,35 @@ +# +# Add sitevars for new protogeni idle handling. +# +use strict; +use libdb; + +sub DoUpdate($$$) +{ + my ($dbhandle, $dbname, $version) = @_; + + DBQueryFatal("INSERT INTO sitevariables VALUES ". + " ('protogeni/idlecheck_norenew',NULL,'0', ". + " 'When set, refuse too allow idle slices to be ". + "renewed.',0)") + if (!TBSiteVarExists("protogeni/idlecheck_norenew")); + + DBQueryFatal("INSERT INTO sitevariables VALUES ". + " ('protogeni/idlecheck_threshold',NULL,'4', ". + " 'Number of hours after which a slice is ". + "considered idle.',0)") + if (!TBSiteVarExists("protogeni/idlecheck_threshold")); + + DBQueryFatal("INSERT INTO sitevariables VALUES ". + " ('protogeni/initial_sliver_lifetime','6','6', ". + " 'The initial sliver lifetime. In hours. Also see ". + "protogeni/max_sliver_lifetime.',0)") + if (!TBSiteVarExists("protogeni/default_sliver_lifetime")); + + return 0; +} +1; + +# Local Variables: +# mode:perl +# End: