Code Review
/
joid.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(parent:
147158b
)
Sources in subordinate.yaml
81/22581/1
author
Stuart Mackie
<wsmackie@juniper.net>
Thu, 29 Sep 2016 23:25:29 +0000
(16:25 -0700)
committer
Stuart Mackie
<wsmackie@juniper.net>
Thu, 29 Sep 2016 23:25:29 +0000
(16:25 -0700)
Change-Id: I95f49c22d4e8899ec0983ae545fb8c5194bd8aaa
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
ci/config_tpl/bundle_tpl/subordinate.yaml
patch
|
blob
|
history
diff --git
a/ci/config_tpl/bundle_tpl/subordinate.yaml
b/ci/config_tpl/bundle_tpl/subordinate.yaml
index
48ad33b
..
178328f
100644
(file)
--- a/
ci/config_tpl/bundle_tpl/subordinate.yaml
+++ b/
ci/config_tpl/bundle_tpl/subordinate.yaml
@@
-36,8
+36,10
@@
{% elif os.network.controller == 'ocl' %}
neutron-api-contrail:
charm: local:{{ ubuntu.release }}/neutron-api-contrail
+ install-sources: ppa:opencontrail/trunk-20160812
neutron-contrail:
charm: local:{{ ubuntu.release }}/neutron-contrail
+ install-sources: ppa:opencontrail/trunk-20160812
keepalived:
charm: local:{{ ubuntu.release }}/keepalived
options: