agent: fix network.bridge.type to be optional

iHiroakiKawai · iHiroakiKawai · commit e9a6d47316d8 · 2013-05-28T11:56:42.000+09:00
New network.bridge.type was introduced, but for
buckward compatibility, the key should be optional.

Signed-off-by: Hiroaki KAWAI &lt;kawai@stratosphere.co.jp&gt;
diff --git a/agent/bindir/cloud-setup-agent.in b/agent/bindir/cloud-setup-agent.in
@@ -96,7 +96,9 @@ if __name__ == '__main__':
     parser.add_option("--guestNic", dest="guestNic", help="Guest traffic interface")
 
     old_config = configFileOps("@AGENTSYSCONFDIR@/agent.properties")
-    glbEnv.bridgeType = old_config.getEntry("network.bridge.type").lower()
+    bridgeType = old_config.getEntry("network.bridge.type").lower()
+    if bridgeType:
+        glbEnv.bridgeType = bridgeType
 
     (options, args) = parser.parse_args()
     if options.auto is None:
