diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-25 12:47:44 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-25 14:46:38 -0500 |
| commit | bba15961e7ffeaa27bb1d0f9c2f975a7f187fdd5 (patch) | |
| tree | 7675d6b9efbc5e81bf45eb740899b0040d03046e /ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | |
| parent | 104b79844106eb6961b361b70071ad70f0dd9c95 (diff) | |
modified to accomodate OCL
Change-Id: Ib8227c4050b51adc2c466511bedf47e45a817db1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/subordinate.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | 20 |
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: |