summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-02-09 08:07:34 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-02-09 20:15:58 +0000
commit2d803e7d609745ee0e1f88ec154f007bbdce8fe6 (patch)
treea2c16ab15040dd688fecc9768e472b4c3930a08a
parentd4a5e892f22a2cd1d0e139350849e1e15d78736c (diff)
enable resize so that func test can pass.
Change-Id: I68b0f63c05303ef6493cc4167b1283579d2b0765 (cherry picked from commit d39c5b22b0aadefbd012cb200a857386f3545d60)
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml1
6 files changed, 6 insertions, 0 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index cdcd0ffb..fed8a714 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -161,6 +161,7 @@ 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 d64d0a4f..e7d9dc3a 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -135,6 +135,7 @@ 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 887c3941..9a577c83 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -113,6 +113,7 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
+ enable-resize: True
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 d9dd74c8..53f7d510 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -166,6 +166,7 @@ openstack-phase2:
options:
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
+ enable-resize: True
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 ed2aba24..8e248ba4 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -111,6 +111,7 @@ openstack-phase2:
options:
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
+ enable-resize: True
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 c21629d8..09b4675a 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -113,6 +113,7 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
enable-live-migration: False
manage-neutron-plugin-legacy-mode: False
+ enable-resize: True
to:
- "nodes-compute=0"
# - "nodes-compute=1"