From 2f38e1c713145ffa047cefc6efe57d92aeed0d69 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Fri, 22 Jun 2012 10:23:03 -0700 Subject: [PATCH] From:Jason Bausewein [jason.bausewein@tier3.com] I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts --- tools/marvin/marvin/configGenerator.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 7967ab43ccd..aec253b73a2 100644 --- a/tools/marvin/marvin/configGenerator.py +++ b/tools/marvin/marvin/configGenerator.py @@ -198,8 +198,8 @@ def describe_setup_in_basic_mode(): h.password = "password" memory = 8*1024*1024*1024 localstorage=1*1024*1024*1024*1024 - #h.url = "http://Sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"%(l,i,j,k,memory,localstorage) - h.url = "http://Sim/%d%d%d%d"%(l,i,j,k) + #h.url = "http://sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"%(l,i,j,k,memory,localstorage) + h.url = "http://sim/%d%d%d%d"%(l,i,j,k) c.hosts.append(h) '''add 2 primary storages''' @@ -297,8 +297,8 @@ def describe_setup_in_advanced_mode(): h.password = "password" memory = 8*1024*1024*1024 localstorage=1*1024*1024*1024*1024 - #h.url = "http://Sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"%(l,i,j,k,memory,localstorage) - h.url = "http://Sim/%d%d%d%d"%(l,i,j,k) + #h.url = "http://sim/%d%d%d%d/cpucore=1&cpuspeed=8000&memory=%d&localstorage=%d"%(l,i,j,k,memory,localstorage) + h.url = "http://sim/%d%d%d%d"%(l,i,j,k) c.hosts.append(h) '''add 2 primary storages'''