OS-1744 add support for zonecfg flags added by OS-1170 to VM.js

TritonDataCenter · Dec 6, 2012 · c56350e · c56350e
1 parent 7cfe3ff
commit c56350e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 13 deletions.
diff --git a/src/vm/lib/metadata/agent.js b/src/vm/lib/metadata/agent.js
@@ -75,6 +75,9 @@ MetadataAgent.prototype.createServersOnExistingZones = function (callback) {
           if (zone.brand === 'kvm') {
             self.startKVMSocketServer(zone.zonename, callback);
           }
+          else if (zone.force_metadata_socket) {
+            self.startZoneSocketServer(zone.zonename, false, callback);
+          }
           else {
             self.startZoneSocketServer(zone.zonename, true, callback);
           }
@@ -103,6 +106,9 @@ MetadataAgent.prototype.start = function () {
         if (self.zones[msg.zonename].brand === 'kvm') {
           self.startKVMSocketServer(msg.zonename);
         }
+        else if (self.zones[msg.zonename].force_metadata_socket) {
+          self.startZoneSocketServer(msg.zonename, false);
+        }
         else {
           self.startZoneSocketServer(msg.zonename, true);
         }

diff --git a/src/vm/node_modules/VM.js b/src/vm/node_modules/VM.js