3 files changed, 3 insertions, 5 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 73a8b3f0..39864ffd 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -7,7 +7,6 @@ trusty-mitaka-nodes:
 trusty-mitaka:
   inherits: openstack-phase2
   overrides:
-#    cluster_count: 3
     #os-data-network: 10.4.8.0/21
     #ceph-cluster-network: 10.4.0.0/21
     #prefer-ipv6: true
@@ -337,7 +336,6 @@ openstack-phase2:
         console-access-protocol: novnc
         network-manager: Neutron
         service-guard: true
-        neutron-external-network: ext_net
         vip: 10.4.1.16
         #os-public-hostname: api.public-fqdn
       to:
@@ -391,7 +389,7 @@ openstack-phase2:
     neutron-api-odl:
       charm: local:trusty/neutron-api-odl
       options:
-        overlay-network-type: 'vxlan gre'
+        overlay-network-type: 'vxlan'
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index 4c52b991..fc9e9edd 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -261,7 +261,7 @@ openstack-phase2:
     neutron-api-odl:
       charm: local:trusty/neutron-api-odl
       options:
-        overlay-network-type: 'vxlan gre'
+        overlay-network-type: 'vxlan'
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index c01dad15..ed34e932 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -269,7 +269,7 @@ openstack-phase2:
     neutron-api-odl:
       charm: local:trusty/neutron-api-odl
       options:
-        overlay-network-type: 'vxlan gre'
+        overlay-network-type: 'vxlan'
         security-groups: True
     openvswitch-odl:
       charm: local:trusty/openvswitch-odl