modified for resize it seems live migration should be true for

resize as well.

Change-Id: I070bdf4419dc4ee93400906fccfbcc19067c5dde
(cherry picked from commit 18666ccb83424f16b6bdd90a106c2b4cd5dc98a6)

6 files changed, 16 insertions, 14 deletions

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index fed8a714..cdcd0ffb 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -161,7 +161,6 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
-        enable-resize: true
       to:
         - "nodes-compute=0"
         - "nodes-compute=1"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index e7d9dc3a..d64d0a4f 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -135,7 +135,6 @@ openstack-phase2:
         enable-resize: true
         manage-neutron-plugin-legacy-mode: false
         migration-auth-type: ssh
-        enable-resize: true
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 9a577c83..33dd5eb3 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -111,9 +111,10 @@ openstack-phase2:
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-        enable-resize: True
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 53f7d510..f1d2ed12 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -164,9 +164,10 @@ openstack-phase2:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 2
       options:
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-        enable-resize: True
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
         - "nodes-compute=1"
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 8e248ba4..f7d7c476 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -109,9 +109,10 @@ openstack-phase2:
       branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
       num_units: 1
       options: 
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-        enable-resize: True
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 09b4675a..41c0fb16 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -111,9 +111,10 @@ openstack-phase2:
       num_units: 1
       options:
         openstack-origin-git: include-file://nova-master.yaml
-        enable-live-migration: False
-        manage-neutron-plugin-legacy-mode: False
-        enable-resize: True
+        enable-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"