Permalink
Browse files

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

  • Loading branch information...
1 parent 7cfe3ff commit c56350ead06122e09227a381c2a5a712a46ccbd8 @joshwilsdon joshwilsdon committed Dec 6, 2012
Showing with 40 additions and 13 deletions.
  1. +6 −0 src/vm/lib/metadata/agent.js
  2. +34 −13 src/vm/node_modules/VM.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);
}
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit c56350e

Please sign in to comment.