cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [3/3] git commit: updated refs/heads/4.1 to 157ee48
Date Tue, 28 May 2013 13:11:32 GMT
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 <kawai@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/157ee482
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/157ee482
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/157ee482

Branch: refs/heads/4.1
Commit: 157ee4827b0be653f8d0c611869abebf46377d90
Parents: aa29234
Author: Hiroaki KAWAI <kawai@stratosphere.co.jp>
Authored: Tue May 28 11:55:21 2013 +0900
Committer: Chip Childers <chipchilders@apache.org>
Committed: Tue May 28 09:10:54 2013 -0400

----------------------------------------------------------------------
 agent/bindir/cloud-setup-agent.in |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/157ee482/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:


Mime
View raw message