diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-04-11 11:03:25 -0500 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-04-11 16:05:26 +0000 |
commit | c752a0d51dafc54b6158a675cadfc9fd072431b7 (patch) | |
tree | f486c775265db15eaa95f04e7f59d496ef102515 /ci/odl/juju-deployer | |
parent | 9890ae1876fcd3dc0872b324405cc99cb64df757 (diff) |
modified as per latest commits from the cloud controllerc charm as
no legacy quantum plugin available.
Change-Id: Iaefdbab9f7e659fb4ec68439d59fcd01d2548145
(cherry picked from commit 37b93a7392ab8ca3e0a20f8194576b671ecb1904)
Diffstat (limited to 'ci/odl/juju-deployer')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 1 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 1 | ||||
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 1 |
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 f1d2ed12..0b3b93f3 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -180,7 +180,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: |