From e9a6d47316d8de90eb662e9938ea7fcbe0ee0596 Mon Sep 17 00:00:00 2001 From: Hiroaki KAWAI Date: Tue, 28 May 2013 11:55:21 +0900 Subject: [PATCH] agent: fix network.bridge.type to be optional New network.bridge.type was introduced, but for buckward compatibility, the key should be optional. Signed-off-by: Hiroaki KAWAI --- agent/bindir/cloud-setup-agent.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agent/bindir/cloud-setup-agent.in b/agent/bindir/cloud-setup-agent.in index d6f481db2e0..6932672b962 100755 --- 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: