JIRA: BOTTLENECK-75
Change-Id: Ib6db60956285e172c93411e23454a7c5240eacde
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
private_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'fixed']
public_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'floating']
private_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'fixed']
public_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'floating']
- if name.find("rubbos_control") >= 0:
+ if name.find("rubbos-control") >= 0:
control_public_ip = public_ip[0]
control_server = str(name) + ':' + public_ip[0] + ':' + private_ip[0]
control_public_ip = public_ip[0]
control_server = str(name) + ':' + public_ip[0] + ':' + private_ip[0]
- if name.find("rubbos_client") >= 0:
+ if name.find("rubbos-client") >= 0:
client_servers = client_servers + str(name)+':'+private_ip[0] + ","
client_servers = client_servers + str(name)+':'+private_ip[0] + ","
- if name.find("rubbos_httpd") >= 0:
+ if name.find("rubbos-httpd") >= 0:
web_servers = web_servers + str(name)+':'+private_ip[0] + ","
web_servers = web_servers + str(name)+':'+private_ip[0] + ","
- if name.find("rubbos_tomcat") >= 0:
+ if name.find("rubbos-tomcat") >= 0:
app_servers = app_servers + str(name) + ':' + private_ip[0] + ","
app_servers = app_servers + str(name) + ':' + private_ip[0] + ","
- if name.find("rubbos_cjdbc") >= 0:
+ if name.find("rubbos-cjdbc") >= 0:
cjdbc_controller = str(name) + ':' + private_ip[0]
cjdbc_controller = str(name) + ':' + private_ip[0]
- if name.find("rubbos_mysql") >= 0:
+ if name.find("rubbos-mysql") >= 0:
database_servers = database_servers + str(name) + ':' + private_ip[0] + ","
client_servers = client_servers[0:len(client_servers)-1]
database_servers = database_servers + str(name) + ':' + private_ip[0] + ","
client_servers = client_servers[0:len(client_servers)-1]
subprocess.call(cmd, shell=True)
print "## neutruon net-list:"
subprocess.call("neutron net-list", shell=True)
subprocess.call(cmd, shell=True)
print "## neutruon net-list:"
subprocess.call("neutron net-list", shell=True)
- print "## neutron subnet-list:"
- subprocess.call("neutron subnet-list", shell=True)
- print "## neutron security-group-list:"
- subprocess.call("neutron security-group-list", shell=True)
+ print "## nova list:"
+ subprocess.call("nova list", shell=True)
print "############### Test #################"
cmd = "scp " + ssh_args + "rubbos.conf ubuntu@" + control_public_ip + ":/home/ubuntu/"
print "############### Test #################"
cmd = "scp " + ssh_args + "rubbos.conf ubuntu@" + control_public_ip + ":/home/ubuntu/"
allocation_pools:
- start: { get_param: private_net_pool_start }
end: { get_param: private_net_pool_end }
allocation_pools:
- start: { get_param: private_net_pool_start }
end: { get_param: private_net_pool_end }
+ dns_nameservers: [ "8.8.8.8" ]
router:
type: OS::Neutron::Router
router:
type: OS::Neutron::Router
rubbos_httpd:
type: OS::Nova::Server
properties:
rubbos_httpd:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_mysql1:
type: OS::Nova::Server
properties:
rubbos_mysql1:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_tomcat1:
type: OS::Nova::Server
properties:
rubbos_tomcat1:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_client1:
type: OS::Nova::Server
properties:
rubbos_client1:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_client2:
type: OS::Nova::Server
properties:
rubbos_client2:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_client3:
type: OS::Nova::Server
properties:
rubbos_client3:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_client4:
type: OS::Nova::Server
properties:
rubbos_client4:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
rubbos_client5:
type: OS::Nova::Server
properties:
rubbos_client5:
type: OS::Nova::Server
properties:
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }