Merge lp:~jamesbeedy/charms/trusty/nova-compute/fix_instance_resize into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[james beedy]

Added configs to nova.conf to fix facilitate instance resize.

Fixes: Bug #1522950

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #14875 nova-compute-next for jamesbeedy mp279653
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/14875/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #13872 nova-compute-next for jamesbeedy mp279653
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/13872/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #8144 nova-compute-next for jamesbeedy mp279653
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/13679595/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8144/

Unmerged revisions

186. By james beedy on 2015-12-04

Added configs to nova.conf to enable support for instance resize.

Added allow_resize_to_same_host=true” and “allow_migrate_to_same_host=true”
to nova.conf files for each openstack release to facilitate instance resize.

Fixes: Bug #1522950

=== modified file 'templates/grizzly/nova.conf'
--- templates/grizzly/nova.conf	2014-07-10 09:17:19 +0000
+++ templates/grizzly/nova.conf	2015-12-04 20:24:29 +0000
@@ -21,6 +21,8 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
+allow_resize_to_same_host=true
+allow_migrate_to_same_host=true
 
 {% include "parts/database" %}
 
 
=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2015-09-25 14:58:23 +0000
+++ templates/havana/nova.conf	2015-12-04 20:24:29 +0000
@@ -15,6 +15,8 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
+allow_migrate_to_same_host=true
+allow_resize_to_same_host=true
 
 {% if arch == 'aarch64' -%}
 libvirt_use_virtio_for_bridges=False
 
=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2015-09-25 14:58:23 +0000
+++ templates/icehouse/nova.conf	2015-12-04 20:24:29 +0000
@@ -15,6 +15,8 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
+allow_resize_to_same_host=true
+allow_migrate_to_same_host=true
 
 {% if arch == 'aarch64' -%}
 libvirt_use_virtio_for_bridges=False
 
=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-10-14 14:08:38 +0000
+++ templates/juno/nova.conf	2015-12-04 20:24:29 +0000
@@ -15,6 +15,8 @@
 state_path=/var/lib/nova
 lock_path=/var/lock/nova
 force_dhcp_release=True
+allow_migrate_to_same_host=true
+allow_resize_to_same_host=true
 
 {% if arch == 'aarch64' -%}
 libvirt_use_virtio_for_bridges=False
 
=== modified file 'templates/kilo/nova.conf'
--- templates/kilo/nova.conf	2015-11-04 16:06:18 +0000
+++ templates/kilo/nova.conf	2015-12-04 20:24:29 +0000
@@ -20,6 +20,8 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 my_ip = {{ host_ip }}
+allow_resize_to_same_host=true
+allow_migrate_to_same_host=true
 
 {% if arch == 'aarch64' -%}
 libvirt_use_virtio_for_bridges=False