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 <ka...@stratosphere.co.jp> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9a6d473 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9a6d473 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9a6d473 Branch: refs/heads/vmware-storage-motion Commit: e9a6d47316d8de90eb662e9938ea7fcbe0ee0596 Parents: 883333c Author: Hiroaki KAWAI <ka...@stratosphere.co.jp> Authored: Tue May 28 11:55:21 2013 +0900 Committer: Hiroaki KAWAI <ka...@stratosphere.co.jp> Committed: Tue May 28 11:56:42 2013 +0900 ---------------------------------------------------------------------- agent/bindir/cloud-setup-agent.in | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9a6d473/agent/bindir/cloud-setup-agent.in ---------------------------------------------------------------------- diff --git a/agent/bindir/cloud-setup-agent.in b/agent/bindir/cloud-setup-agent.in index d6f481d..6932672 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:
