From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 18 Feb 2016 23:41:46 +0000 (-0600)
Subject: updates the onos charm with migration and resize enablement.
X-Git-Tag: brahmaputra.1.0~7
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F10243%2F1;p=joid.git

updates the onos charm with migration and resize enablement.

Change-Id: I8a2797ee16231cb4ff8ef79ad5bc4244126cac89
(cherry picked from commit 2ca48e5d0b008e3054fd1ae04eef881e2a46eea7)
---

diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 9c455aba..b59c3f89 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -166,8 +166,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-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/onos/juju-deployer/ovs-onos-nonha.yaml b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
index c5f6eae4..eb0d74b5 100644
--- a/ci/onos/juju-deployer/ovs-onos-nonha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-nonha.yaml
@@ -110,8 +110,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-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/onos/juju-deployer/ovs-onos-tip.yaml b/ci/onos/juju-deployer/ovs-onos-tip.yaml
index d9496599..55525ef2 100644
--- a/ci/onos/juju-deployer/ovs-onos-tip.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-tip.yaml
@@ -112,8 +112,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-live-migration: true
+        enable-resize: true
+        manage-neutron-plugin-legacy-mode: false
+        migration-auth-type: ssh
       to:
         - "nodes-compute=0"
 #        - "nodes-compute=1"