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=015130b7407b6a97f236ed20c6174e42a239a008;hpb=3add42efb7e43db0cc770563d3ecc32ccb493ccd;p=joid.git

diff --git a/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml b/ci/config_tpl/juju2/bundle_tpl/subordinate.yaml
index 015130b7..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 %}
@@ -25,11 +25,13 @@
     openvswitch-odl:
       charm: ./{{ ubuntu.release }}/openvswitch-odl
       options:
-+{% if opnfv.ext_port is defined  %}
-+        provider_mappings: "physnet1:{{ opnfv.ext_port }}"
-+{% endif %}
+{% if opnfv.ext_port is defined  %}
+        provider_mappings: "physnet1:{{ opnfv.ext_port }}"
+{% endif %}
 {% if opnfv.spaces_dict.data is defined %}
         os-data-network: {{ opnfv.spaces_dict.data.cidr }}
+{% else %}
+        os-data-network: {{ opnfv.spaces_dict.admin.cidr }}
 {% endif %}
 {% elif os.network.controller == 'onos' %}
     neutron-api-onos:
@@ -46,31 +48,16 @@
 {% 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:
       charm: ./{{ ubuntu.release }}/lxd
       options:
+{% if 'srv' not in opnfv.storage_dict.ceph.disk %}
+        block-devices: {{ opnfv.storage_dict.ceph.disk }}
+        overwrite: true
+        storage-type: zfs
+{% endif %}
 {% endif %}
 {% if opnfv.storage_dict.scaleio is defined %}
     scaleio-openstack: