X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fconfig_tpl%2Fbundle_tpl%2Foclphase1.yaml;h=84d52bc7c57af4e2a5fb5ca7b5670c5081ab695d;hb=bbd5aa8591fb02f6c73217df81108d43cfc747b4;hp=1acdd1ca609e8a310e1cac04c73a775ec42e2ba1;hpb=147158b3f12ad77e3b0fc3a9f06d05d3c083e87f;p=joid.git

diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index 1acdd1ca..84d52bc7 100644
--- a/ci/config_tpl/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/bundle_tpl/oclphase1.yaml
@@ -1,7 +1,7 @@
     zookeeper:
-      charm: local:{{ ubuntu.release }/zookeeper
+      charm: local:{{ ubuntu.release }}/zookeeper
       num_units: {{ unit_qty() }}
-      series: {{ ubuntu.release }
+      series: {{ ubuntu.release }}
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -19,10 +19,13 @@
       charm: local:{{ ubuntu.release }}/contrail-configuration
       num_units: {{ unit_qty() }}
       options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.contrailconfig }}
 {% endif %}
-      install-sources: ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -30,7 +33,11 @@
     contrail-control:
       charm: local:{{ ubuntu.release }}/contrail-control
       num_units: {{ unit_qty() }}
-      install-sources: ppa:opencontrail/trunk-20160812
+      options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -38,7 +45,11 @@
     contrail-analytics:
       charm: local:{{ ubuntu.release }}/contrail-analytics
       num_units: {{ unit_qty() }}
-      install-sources: ppa:opencontrail/trunk-20160812
+      options:
+        openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -46,7 +57,10 @@
     contrail-webui:
       charm: local:{{ ubuntu.release }}/contrail-webui
       num_units: {{ unit_qty() }}
-      install-sources: ppa:opencontrail/trunk-20160812
+      options:
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -61,7 +75,7 @@
         - "lxc:nodes={{ unit_id }}"
 {% endfor %}
     kafka:
-      charm: local:{{ ubuntu.release }}/kafka:
+      charm: local:{{ ubuntu.release }}/kafka
       num_units: {{ unit_qty() }}
       to:
 {% for unit_id in to_select() %}