diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-16 20:24:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-16 20:24:41 +0000 |
| commit | 5076c90f93ea2ccd0a5161cc6f47f952422a23ca (patch) | |
| tree | f18a33812ab85b90e64d860e7e45e263019b5de5 /ci | |
| parent | 19fdbab5b2ad2a0c8be810f1ad17c1108b9a29c5 (diff) | |
| parent | 8c1aa9c2892d3c69a96a3da950a5f10ce8305d7f (diff) | |
Merge "remove the flat network type to support ODL."
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 3273d0d0..3680f285 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -348,7 +348,7 @@ openstack-phase2: num_units: 3 options: neutron-security-groups: True - flat-network-providers: "*" + manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 #os-public-hostname: api.public-fqdn to: diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index 269bf250..443b5d08 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -231,7 +231,7 @@ openstack-phase2: charm: local:trusty/neutron-api options: neutron-security-groups: True - flat-network-providers: "*" + manage-neutron-plugin-legacy-mode: False to: - "lxc:nodes=1" neutron-gateway: diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 4bd4e1e5..a720dc8d 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -236,7 +236,7 @@ openstack-phase2: charm: local:trusty/neutron-api options: neutron-security-groups: True - flat-network-providers: "*" + manage-neutron-plugin-legacy-mode: False to: - "lxc:nodes=0" neutron-gateway: |