openstack/fuel-library
Code Issues Proposed changes

Merge "Add ha_provider param"

Browse Source
This commit is contained in:
vic 2013-03-22 12:56:38 +04:00 committed by Gerrit Code Review
commit 7413cb5802
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_test/cobbler/test_compact.py
View File

@ -36,7 +36,7 @@ class CompactTestCase(CobblerTestCase):
template=Template.compact(), ci=self.ci(), template=Template.compact(), ci=self.ci(),
controllers=self.nodes().controllers, controllers=self.nodes().controllers,
quantums=self.nodes().quantums, quantums=self.nodes().quantums,
quantum=True, quantum_netnode_on_cnt=False) quantum=True, quantum_netnode_on_cnt=False, ha_provider=False)
self.deploy_compact(quantum_node=True) self.deploy_compact(quantum_node=True)
if CREATE_SNAPSHOTS: if CREATE_SNAPSHOTS:
self.environment().snapshot('compact', force=True) self.environment().snapshot('compact', force=True)

8
fuel_test/manifest.py
View File

@ -254,7 +254,8 @@ class Manifest(object):
def write_openstack_ha_minimal_manifest(self, remote, template, ci, controllers, quantums, def write_openstack_ha_minimal_manifest(self, remote, template, ci, controllers, quantums,
proxies=None, use_syslog=True, proxies=None, use_syslog=True,
quantum=True, loopback=True, quantum=True, loopback=True,
cinder=True, cinder_on_computes=False, quantum_netnode_on_cnt=True): cinder=True, cinder_on_computes=False, quantum_netnode_on_cnt=True,
ha_provider='pacemaker'):
template.replace( template.replace(
internal_virtual_ip=ci.internal_virtual_ip(), internal_virtual_ip=ci.internal_virtual_ip(),
public_virtual_ip=ci.public_virtual_ip(), public_virtual_ip=ci.public_virtual_ip(),
@ -283,6 +284,7 @@ class Manifest(object):
template.replace( template.replace(
quantum=quantum, quantum=quantum,
quantum_netnode_on_cnt=quantum_netnode_on_cnt, quantum_netnode_on_cnt=quantum_netnode_on_cnt,
ha_provider=ha_provider,
) )
self.write_manifest(remote, template) self.write_manifest(remote, template)
@ -291,7 +293,8 @@ class Manifest(object):
def write_openstack_manifest(self, remote, template, ci, controllers, quantums, def write_openstack_manifest(self, remote, template, ci, controllers, quantums,
proxies=None, use_syslog=True, proxies=None, use_syslog=True,
quantum=True, loopback=True, quantum=True, loopback=True,
cinder=True, swift=True, quantum_netnode_on_cnt=True): cinder=True, swift=True, quantum_netnode_on_cnt=True,
ha_provider='pacemaker'):
template.replace( template.replace(
internal_virtual_ip=ci.internal_virtual_ip(), internal_virtual_ip=ci.internal_virtual_ip(),
public_virtual_ip=ci.public_virtual_ip(), public_virtual_ip=ci.public_virtual_ip(),
@ -322,6 +325,7 @@ class Manifest(object):
template.replace( template.replace(
quantum=quantum, quantum=quantum,
quantum_netnode_on_cnt=quantum_netnode_on_cnt, quantum_netnode_on_cnt=quantum_netnode_on_cnt,
ha_provider=ha_provider,
) )
self.write_manifest(remote, template) self.write_manifest(remote, template)