X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fjuju2%2Fbundle_tpl%2Fsubordinate.yaml;h=59469aef7c570ee62382f250c4b7ed0fac16b735;hb=dce9b446825d4d90f145424a9d7079ba8f3b649b;hp=07b0cc7a8a2203f74e484b666b1e2dec83b1ad97;hpb=bba15961e7ffeaa27bb1d0f9c2f975a7f187fdd5;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 07b0cc7a..59469aef 100644
--- a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
@@ -1,9 +1,9 @@
 
+{% if os.network.controller != 'ocl' %}
     ceilometer-agent:
       charm: ./{{ ubuntu.release }}/ceilometer-agent
       options:
-        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-{% if os.beta.public_api %}
+        openstack-origin: *openstack-origin
         use-internal-endpoints: true
 {% endif %}
 {% if opnfv.storage_dict.ceph is defined %}