openstack/fuel-library
Code Issues Proposed changes

Fix role name

Browse Source
This commit is contained in:
vic 2013-03-17 05:49:44 +04:00
parent 6b2fb969df
commit 9fe9339268
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/openstack/examples/site_openstack_ha_full.pp
View File

@ -124,7 +124,7 @@ $public_address = $node[0]['public_address']
$controller_internal_addresses = nodes_to_hash(filter_nodes($nodes,'role','controller'),'name','internal_address')
$controller_public_addresses = nodes_to_hash(filter_nodes($nodes,'role','controller'),'name','public_address')
$controller_hostnames = keys($controller_internal_addresses)
$swift_proxies = nodes_to_hash(filter_nodes($nodes,'role','proxy'),'name','internal_address')
$swift_proxies = nodes_to_hash(filter_nodes($nodes,'role','swift-proxy'),'name','internal_address')
#Set this to anything other than pacemaker if you do not want Quantum HA

2
fuel_test/astute.py
View File

@ -18,7 +18,7 @@ class Astute(object):
map(lambda x: config.update({str(x.name): {'role': 'controller'}}), controllers)
map(lambda x: config.update({str(x.name): {'role': 'compute'}}), computes)
map(lambda x: config.update({str(x.name): {'role': 'storage'}}), storages)
map(lambda x: config.update({str(x.name): {'role': 'proxy'}}), proxies)
map(lambda x: config.update({str(x.name): {'role': 'swift-proxy'}}), proxies)
map(lambda x: config.update({str(x.name): {'role': 'quantum'}}), quantums)
return yaml.dump(config)

2
fuel_test/manifest.py
View File

@ -130,7 +130,7 @@ class Manifest(object):
elif node in ci.nodes().storages:
rv = 'storage'
elif node in ci.nodes().proxies:
rv = 'proxy'
rv = 'swift-proxy'
elif node in ci.nodes().quantums:
rv = 'quantum'
elif node in ci.nodes().masters: