etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Hiroaki KAWAI 2013-05-28 11:55:21 +09:00 committed by Chip Childers
parent aa29234ee0
commit 157ee4827b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/bindir/cloud-setup-agent.in
View File

@ -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: