summaryrefslogtreecommitdiffstats
path: root/ci/nosdn/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-27 21:03:03 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-27 21:19:35 -0500
commit12ebb176750bd938d145279981026d38bc46b2b2 (patch)
tree83bd19b7200f45a0cc600e686a8f716d90a9b239 /ci/nosdn/juju-deployer
parenta4f7d6c684931d934ac0dce6fdf7dcdfd7fef8c2 (diff)
modfied openstack.sh to create only required data.
Change-Id: I8608196a7e47568aba66e10986165af88089bf57 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/nosdn/juju-deployer')
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml3
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml4
-rw-r--r--ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml3
3 files changed, 6 insertions, 4 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index b4ab8bfc..cfaecb54 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -307,7 +307,8 @@ openstack-phase2:
num_units: 3
options:
neutron-security-groups: true
- flat-network-providers: "*"
+ overlay-network-type: vxlan
+ #flat-network-providers: "*"
vip: 10.4.1.17
to:
- "lxc:nodes=1"
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 1442ea7e..de7f7547 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -204,8 +204,8 @@ openstack-phase2:
charm: "local:trusty/neutron-api"
options:
neutron-security-groups: true
- flat-network-providers: "*"
-# overlay-network-type: vxlan
+ #flat-network-providers: "*"
+ overlay-network-type: vxlan
to:
- "lxc:nodes=1"
neutron-gateway:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index be5cc4d1..8519334e 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -229,7 +229,8 @@ openstack-phase2:
charm: local:charms/trusty/neutron-api
options:
neutron-security-groups: True
- flat-network-providers: "*"
+ overlay-network-type: vxlan
+ #flat-network-providers: "*"
to:
- "lxc:nodes=0"
neutron-gateway: