Add ppa:opencontrail/ppa to bundle config files

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

diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml
index 48ad33b..b9233ce 100644 (file)
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -1,8 +1,18 @@
+
     ceilometer-agent:
       charm: local:{{ ubuntu.release }}/ceilometer-agent
+      options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+{% if os.beta.public_api %}
+        use-internal-endpoints: true
+{% endif %}
 {% if opnfv.storage_dict.ceph is defined %}
     cinder-ceph:
       charm: local:{{ ubuntu.release }}/cinder-ceph
+      options:
+{% if opnfv.storage_dict.ceph is defined %}
+        ceph-osd-replication-count: {{ unit_ceph_qty() }}
+{% endif %}
 {% endif %}
 {% if os.network.controller == 'nosdn' %}
 {% include 'neutron-ovs.yaml' %}
@@ -34,13 +44,28 @@
         profile: onos-sfc
 {% endif %}
 {% elif os.network.controller == 'ocl' %}
+    ceilometer-contrail:
+      charm: local:{{ ubuntu.release }}/ceilometer-contrail
+      options:
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     neutron-api-contrail:
       charm: local:{{ ubuntu.release }}/neutron-api-contrail
+      options:
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     neutron-contrail:
       charm: local:{{ ubuntu.release }}/neutron-contrail
+      options:
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     keepalived:
       charm: local:{{ ubuntu.release }}/keepalived
       options:
+        router-id: 1
 {% if os.ha.mode == 'ha' %}
         virtual-ip: {{ opnfv.vip.keepalived }}
 {% endif %}
@@ -48,6 +73,7 @@
 {% if os.lxd %}
     lxd:
       charm: local:{{ ubuntu.release }}/lxd
+      options:
 {% endif %}
 {% if opnfv.storage_dict.scaleio is defined %}
     scaleio-openstack: