x/packstack
Code Issues Proposed changes

Merge "Fix libvirt livemigration"

Browse Source
This commit is contained in:
Jenkins
2014-06-18 12:43:36 +00:00
committed by Gerrit Code Review
parent 050f40ddd2 9e4f7c16a5
commit 925dc22af6
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packstack/plugins/nova_300.py
View File

@@ -458,6 +458,17 @@ def create_compute_manifest(config, messages):
for host in compute_hosts:
config["CONFIG_NOVA_COMPUTE_HOST"] = host
manifestdata = getManifestTemplate("nova_compute.pp")
for c_host in compute_hosts:
config['FIREWALL_SERVICE_NAME'] = "nova qemu migration"
config['FIREWALL_PORTS'] = "'49152-49215'"
config['FIREWALL_CHAIN'] = "INPUT"
config['FIREWALL_PROTOCOL'] = 'tcp'
config['FIREWALL_ALLOWED'] = "'%s'" % c_host
config['FIREWALL_SERVICE_ID'] = ("nova_qemu_migration_%s_%s"
% (host, c_host))
manifestdata += getManifestTemplate("firewall.pp")
if config['CONFIG_VMWARE_BACKEND'] == 'y':
manifestdata += getManifestTemplate("nova_compute_vmware.pp")
else:

2
packstack/puppet/templates/nova_compute.pp
View File

@@ -21,7 +21,7 @@ file { '/etc/nova/ssh/nova_migration_key':
nova_config{
"DEFAULT/volume_api_class": value => "nova.volume.cinder.API";
"libvirt/live_migration_uri": value => "qemu+ssh://nova@%%s/system?keyfile=/etc/nova/ssh/nova_migration_key";
"libvirt/live_migration_uri": value => "qemu+ssh://nova@%%s/system?no_verify=1&keyfile=/etc/nova/ssh/nova_migration_key";
}
class {"nova::compute":