modfied to use the default internal endpoint.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / subordinate.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 07b0cc7..59469ae 100644 (file)
--- 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 %}