1 files changed, 2 insertions, 20 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index c9378d91..b12f0a56 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -1,4 +1,5 @@
 
+{% if os.network.controller != 'ocl' %}
     ceilometer-agent:
       charm: ./{{ ubuntu.release }}/ceilometer-agent
       options:
@@ -6,6 +7,7 @@
 {% if os.beta.public_api %}
         use-internal-endpoints: true
 {% endif %}
+{% endif %}
 {% if opnfv.storage_dict.ceph is defined %}
     cinder-ceph:
       charm: ./{{ ubuntu.release }}/cinder-ceph
@@ -48,26 +50,6 @@
 {% if os.network.sfc %}
         profile: onos-sfc
 {% endif %}
-{% elif os.network.controller == 'ocl' %}
-    ceilometer-contrail:
-      charm: ./{{ ubuntu.release }}/ceilometer-contrail
-      options:
-        install-sources: ppa:opencontrail/trunk-20160812
-    neutron-api-contrail:
-      charm: ./{{ ubuntu.release }}/neutron-api-contrail
-      options:
-        install-sources: ppa:opencontrail/trunk-20160812
-    neutron-contrail:
-      charm: ./{{ ubuntu.release }}/neutron-contrail
-      options:
-        install-sources: ppa:opencontrail/trunk-20160812
-    keepalived:
-      charm: ./{{ ubuntu.release }}/keepalived
-      options:
-        router-id: 1
-{% if os.ha.mode == 'ha' %}
-        virtual-ip: {{ opnfv.vip.keepalived }}
-{% endif %}
 {% endif %}
 {% if os.lxd %}
     lxd: