1 files changed, 7 insertions, 12 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index d978c599..7ca3471d 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -24,14 +24,11 @@ openstack:
       constraints: mem=1G
       options:
         network-manager: Neutron
-    neutron-gateway:
-      branch: lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail
-      constraints: mem=1G
     glance:
       branch: lp:~openstack-charmers/charms/trusty/glance/next
       constraints: mem=1G
     neutron-api:
-      branch: lp:~openstack-charmers/charms/trusty/neutron-api/vpp
+      branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
       constraints: mem=1G
       options:
         manage-neutron-plugin-legacy-mode: false
@@ -47,9 +44,6 @@ openstack:
     - [ nova-compute, glance ]
     - [ glance, mysql ]
     - [ glance, keystone ]
-    - [ neutron-gateway, mysql ]
-    - [ "neutron-gateway:amqp", "rabbitmq-server:amqp" ]
-    - [ neutron-gateway, nova-cloud-controller ]
     - [ openstack-dashboard, keystone ]
     - [ neutron-api, mysql ]
     - [ neutron-api, rabbitmq-server ]
@@ -60,12 +54,13 @@ contrail:
   inherits: openstack
   services:
     cassandra:
-      branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install
-      series: precise
+      branch: lp:~stub/charms/trusty/cassandra/noauthentication
       constraints: mem=8G root-disk=20G
+      options:
+        authenticator: AllowAllAuthenticator
       units: 3
     zookeeper:
-      branch: lp:~sdn-charmers/charms/precise/zookeeper/fix-symlink
+      branch: lp:~charmers/charms/precise/zookeeper/trunk
       series: precise
       constraints: mem=1G
       units: 3
@@ -105,11 +100,12 @@ contrail:
     - [ contrail-configuration, zookeeper ]
     - [ contrail-configuration, rabbitmq-server ]
     - [ contrail-configuration, keystone ]
-    - [ contrail-configuration, neutron-gateway ]
     - [ neutron-api-contrail, contrail-configuration ]
     - [ neutron-api-contrail, keystone ]
+    - [ "contrail-control:contrail-api", "contrail-configuration:contrail-api" ]
     - [ "contrail-control:contrail-discovery", "contrail-configuration:contrail-discovery" ]
     - [ "contrail-control:contrail-ifmap", "contrail-configuration:contrail-ifmap" ]
+    - [ contrail-control, keystone ]
     - [ "contrail-analytics:cassandra", "cassandra:database" ]
     - [ contrail-analytics, contrail-configuration ]
     - [ contrail-webui, keystone ]
@@ -118,7 +114,6 @@ contrail:
     - [ "contrail-webui:cassandra", "cassandra:database" ]
     - [ nova-compute, neutron-contrail ]
     - [ "neutron-contrail:contrail-discovery", "contrail-configuration:contrail-discovery" ]
-    - [ neutron-contrail, neutron-gateway ]
     - [ "neutron-contrail:contrail-api", "contrail-configuration:contrail-api" ]
     - [ neutron-contrail, keystone ]
     - [ contrail-configuration, haproxy ]