Updated Branches: refs/heads/master 49b88472a -> 2f38e1c71
From:Jason Bausewein [[email protected]] I needed to change the case in the sim url so the SimulatorDiscover will detect the simulator hosts Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2f38e1c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2f38e1c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2f38e1c7 Branch: refs/heads/master Commit: 2f38e1c713145ffa047cefc6efe57d92aeed0d69 Parents: 356ab7b Author: Edison Su <[email protected]> Authored: Fri Jun 22 10:23:03 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Jun 22 10:23:03 2012 -0700 ---------------------------------------------------------------------- tools/marvin/marvin/configGenerator.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2f38e1c7/tools/marvin/marvin/configGenerator.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index 7967ab4..aec253b 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'''
