Author: jfthomps Date: Wed Oct 19 14:13:46 2011 New Revision: 1186236 URL: http://svn.apache.org/viewvc?rev=1186236&view=rev Log: VCL-30 additional user access methods for connecting to reserved compute node
inserts for connectmethodmap were using imageid instead of imagerevisionid constraint for connectmethodmap was for imageid instead of imagerevisionid VCL-463 insert for serverprofile into resourcetype table needed quotes around 'serverprofile' Modified: incubator/vcl/trunk/mysql/update-vcl.sql Modified: incubator/vcl/trunk/mysql/update-vcl.sql URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/mysql/update-vcl.sql?rev=1186236&r1=1186235&r2=1186236&view=diff ============================================================================== --- incubator/vcl/trunk/mysql/update-vcl.sql (original) +++ incubator/vcl/trunk/mysql/update-vcl.sql Wed Oct 19 14:13:46 2011 @@ -571,12 +571,12 @@ INSERT IGNORE INTO `connectmethod` (`id` -- Inserts for table `connectmethodmap` -- -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, 1); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, NULL); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, NULL); -INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imageid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, NULL); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, 1); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, 1); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, 1); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 2, NULL, NULL, 0, NULL); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (1, 3, NULL, NULL, 0, NULL); +INSERT IGNORE INTO `connectmethodmap` (`connectmethodid`, `OStypeid`, `OSid`, `imagerevisionid`, `disabled`, `autoprovisioned`) VALUES (2, 1, NULL, NULL, 0, NULL); -- -------------------------------------------------------- @@ -642,7 +642,7 @@ INSERT IGNORE provisioningOSinstalltype -- Inserts for table `resourcetype` -- -INSERT IGNORE INTO resourcetype (id, name) VALUES (17, serverprofile); +INSERT IGNORE INTO resourcetype (id, name) VALUES (17, 'serverprofile'); -- -------------------------------------------------------- @@ -708,7 +708,7 @@ CALL AddConstraintIfNotExists('computer' CALL AddConstraintIfNotExists('connectmethodmap', 'connectmethodid', 'connectmethod', 'id'); CALL AddConstraintIfNotExists('connectmethodmap', 'OStypeid', 'OStype', 'id'); CALL AddConstraintIfNotExists('connectmethodmap', 'OSid', 'OS', 'id'); -CALL AddConstraintIfNotExists('connectmethodmap', 'imageid', 'image', 'id'); +CALL AddConstraintIfNotExists('connectmethodmap', 'imagerevisionid', 'imagerevision', 'id'); -- --------------------------------------------------------