diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-27 08:55:04 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-07-27 08:55:45 -0500 |
| commit | f5c6f152b9e9a9f913ffd3ff0cc542ce32f9f4df (patch) | |
| tree | b4f0d213dccb7813ccc59860286562daba7f1f9b /ci/config_tpl/juju2/bundle_tpl/subordinate.yaml | |
| parent | ce06a995fd8986c5cb6502b4070a8f6e79bbe9f8 (diff) | |
changing the bundle which works for OCL.
Change-Id: Id92622368fefca84c3d45eced6d6ca0e0b9790f5
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml index 07b0cc7a..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 |