x
/
packstack
Code Issues Proposed changes

Merge "Allow resize to same host in all-in-one" into stable/ocata

This commit is contained in:
Jenkins 2017-03-10 11:55:18 +00:00 committed by Gerrit Code Review
parent 27141ed8d7 7aefb0dc0d
commit 581dd8ff2e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packstack/plugins/nova_300.py
View File

@ -352,6 +352,8 @@ def create_compute_manifest(config, messages):
'qemu+tcp://nova@%s/system'
)
config["CONFIG_NOVA_ALLOW_RESIZE_TO_SAME"] = len(compute_hosts) == 1
ssh_keys_details = {}
for host in compute_hosts:
try:

1
packstack/puppet/modules/packstack/manifests/nova/compute.pp
View File

@ -57,6 +57,7 @@ class packstack::nova::compute ()
pci_passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'),
instance_usage_audit => $instance_usage_audit,
instance_usage_audit_period => $instance_usage_audit_period,
allow_resize_to_same_host => hiera('CONFIG_NOVA_ALLOW_RESIZE_TO_SAME'),
}
class { '::nova::placement':