summaryrefslogtreecommitdiffstats
path: root/ci/nosdn
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-04-11 11:03:25 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-04-11 11:03:25 -0500
commit37b93a7392ab8ca3e0a20f8194576b671ecb1904 (patch)
tree3969904e66e5ecd3603993b5db4ed3dee7c5268e /ci/nosdn
parentddd47003fecfa2263c6923df0cb9b8ce4459401e (diff)
modified as per latest commits from the cloud controllerc charm as
no legacy quantum plugin available. Change-Id: Iaefdbab9f7e659fb4ec68439d59fcd01d2548145
Diffstat (limited to 'ci/nosdn')
-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
3 files changed, 0 insertions, 3 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
index cdcd0ffb..db599bcf 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml
@@ -146,7 +146,6 @@ openstack-phase2:
num_units: 3
options:
network-manager: Neutron
- quantum-security-groups: 'yes'
service-guard: true
vip: 10.4.1.16
to:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 3712340c..e86990aa 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -127,7 +127,6 @@ openstack-phase2:
num_units: 1
options:
network-manager: Neutron
- quantum-security-groups: 'yes'
to:
- "lxc:nodes-api=0"
nova-compute:
diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index ef368581..8a16129c 100644
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
@@ -128,7 +128,6 @@ openstack-phase2:
openstack-origin-git: include-file://nova-master.yaml
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api: