Fix the parsing issue of topology file
Change-Id: I4ce62d2a51166b868a74b8860d9eb4857a18c9ca
This commit is contained in:
parent
8a8dab7906
commit
fe8fb2f921
|
@ -19,9 +19,11 @@
|
||||||
# Grouping for placing all the server side VMs
|
# Grouping for placing all the server side VMs
|
||||||
# Do not change the group name, you can add as many hosts as needed
|
# Do not change the group name, you can add as many hosts as needed
|
||||||
servers_rack:
|
servers_rack:
|
||||||
hh23-5
|
- hh23-5
|
||||||
|
- hh23-6
|
||||||
|
|
||||||
# Grouping for placing all the client side VMs
|
# Grouping for placing all the client side VMs
|
||||||
# Do not change the group name, you can add as many hosts as needed
|
# Do not change the group name, you can add as many hosts as needed
|
||||||
clients_rack:
|
clients_rack:
|
||||||
hh23-6
|
- hh23-7
|
||||||
|
- hh23-8
|
||||||
|
|
|
@ -38,9 +38,9 @@ class KBScheduler(object):
|
||||||
avail_zone = "nova"
|
avail_zone = "nova"
|
||||||
|
|
||||||
if role == "Server":
|
if role == "Server":
|
||||||
host_list = topology.servers_rack.split()
|
host_list = topology.servers_rack
|
||||||
else:
|
else:
|
||||||
host_list = topology.clients_rack.split()
|
host_list = topology.clients_rack
|
||||||
host_count = len(host_list)
|
host_count = len(host_list)
|
||||||
|
|
||||||
if algorithm == "Round-robin":
|
if algorithm == "Round-robin":
|
||||||
|
|
|
@ -389,7 +389,7 @@ class KloudBuster(object):
|
||||||
self.kb_proxy.boot_info['flavor_type'] = 'kb.proxy' if \
|
self.kb_proxy.boot_info['flavor_type'] = 'kb.proxy' if \
|
||||||
not self.tenants_list['client'] else self.testing_kloud.flavor_to_use
|
not self.tenants_list['client'] else self.testing_kloud.flavor_to_use
|
||||||
if self.topology:
|
if self.topology:
|
||||||
proxy_hyper = self.topology.clients_rack.split()[0]
|
proxy_hyper = self.topology.clients_rack[0]
|
||||||
self.kb_proxy.boot_info['avail_zone'] =\
|
self.kb_proxy.boot_info['avail_zone'] =\
|
||||||
"%s:%s" % (self.testing_kloud.placement_az, proxy_hyper)\
|
"%s:%s" % (self.testing_kloud.placement_az, proxy_hyper)\
|
||||||
if self.testing_kloud.placement_az else "nova:%s" % (proxy_hyper)
|
if self.testing_kloud.placement_az else "nova:%s" % (proxy_hyper)
|
||||||
|
|
Loading…
Reference in New Issue