Add ppa:opencontrail/ppa to bundle config files

Change-Id: Ib34cfed612fef3724b39c0f5cb258ed5bb32e7bc
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>

diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index 31f4ab0..84d52bc 100644 (file)
--- a/ci/config_tpl/bundle_tpl/oclphase1.yaml
+++ b/ci/config_tpl/bundle_tpl/oclphase1.yaml
@@ -20,7 +20,9 @@
       num_units: {{ unit_qty() }}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
 {% if os.ha.mode == 'ha' %}
         vip: {{ opnfv.vip.contrailconfig }}
 {% endif %}
@@ -33,7 +35,9 @@
       num_units: {{ unit_qty() }}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -43,7 +47,9 @@
       num_units: {{ unit_qty() }}
       options:
         openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"
@@ -52,7 +58,9 @@
       charm: local:{{ ubuntu.release }}/contrail-webui
       num_units: {{ unit_qty() }}
       options:
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
       to:
 {% for unit_id in to_select() %}
         - "lxc:nodes={{ unit_id }}"

diff --git a/ci/config_tpl/bundle_tpl/subordinate.yaml b/ci/config_tpl/bundle_tpl/subordinate.yaml
index 1033866..b9233ce 100644 (file)
--- a/ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/ci/config_tpl/bundle_tpl/subordinate.yaml
@@ -47,15 +47,21 @@
     ceilometer-contrail:
       charm: local:{{ ubuntu.release }}/ceilometer-contrail
       options:
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     neutron-api-contrail:
       charm: local:{{ ubuntu.release }}/neutron-api-contrail
       options:
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     neutron-contrail:
       charm: local:{{ ubuntu.release }}/neutron-contrail
       options:
-        install-sources: ppa:opencontrail/trunk-20160812
+        install-sources: |
+          - ppa:opencontrail/ppa
+          - ppa:opencontrail/trunk-20160812
     keepalived:
       charm: local:{{ ubuntu.release }}/keepalived
       options: