summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/subordinate.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/subordinate.yaml20
1 files changed, 0 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..07b0cc7a 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -48,26 +48,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: