summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Mackie <wsmackie@juniper.net>2016-11-30 09:21:08 -0800
committerStuart Mackie <wsmackie@juniper.net>2016-11-30 09:21:08 -0800
commit7a768eee1d5d8825ea5c3d5e79ea36f1225fb1fd (patch)
tree9beca5797c35a25ada282a70cd8b3bd8eb31c909
parentcad1d5cf0b3c9cfd376dc62d1c60f7602eb10031 (diff)
Add ppa:opencontrail/ppa to bundle config files
Change-Id: Ib34cfed612fef3724b39c0f5cb258ed5bb32e7bc Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
-rw-r--r--ci/config_tpl/bundle_tpl/oclphase1.yaml16
-rw-r--r--ci/config_tpl/bundle_tpl/subordinate.yaml12
2 files changed, 21 insertions, 7 deletions
diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index 31f4ab04..84d52bc7 100644
--- 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 1033866e..b9233cef 100644
--- 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: