summaryrefslogtreecommitdiffstats
path: root/ci/odl
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/odl
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/odl')
-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
3 files changed, 0 insertions, 3 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index d806805a..d55bd674 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -194,7 +194,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
service-guard: true
neutron-external-network: ext_net
vip: 10.4.1.16
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 30deb14e..26acec9f 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -128,7 +128,6 @@ openstack-phase2:
options:
console-access-protocol: novnc
network-manager: Neutron
- quantum-security-groups: "yes"
to:
- "lxc:nodes-api=0"
neutron-api:
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 37cb6c1c..1ef94467 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -127,7 +127,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: