diff options
| author |   Stuart Mackie <wsmackie@juniper.net> | 2016-09-29 16:05:56 -0700 |
|---|---|---|
| committer | Stuart Mackie <wsmackie@juniper.net> | 2016-09-29 16:05:56 -0700 |
| commit | 147158b3f12ad77e3b0fc3a9f06d05d3c083e87f (patch) | |
| tree | 136c57ab18938cbf45b0b05a505ec107b85add65 /ci/config_tpl | |
| parent | ad2f78a6248314b156a5d807e911ecd383ab5cad (diff) | |
Changes to the right files this time for OpenContrail deployment
Change-Id: Id8a345f18bd63d8cfbb211af0d24ccc8e89d62be
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/bundle_tpl/oclphase1.yaml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml index afef96c0..1acdd1ca 100644 --- a/ci/config_tpl/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/bundle_tpl/oclphase1.yaml @@ -1,7 +1,7 @@ zookeeper: - charm: local:precise/zookeeper + charm: local:{{ ubuntu.release }/zookeeper num_units: {{ unit_qty() }} - series: precise + series: {{ ubuntu.release } to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" @@ -22,6 +22,7 @@ {% 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 }}" @@ -29,6 +30,7 @@ contrail-control: charm: local:{{ ubuntu.release }}/contrail-control num_units: {{ unit_qty() }} + install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" @@ -36,6 +38,7 @@ contrail-analytics: charm: local:{{ ubuntu.release }}/contrail-analytics num_units: {{ unit_qty() }} + install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" @@ -43,6 +46,7 @@ contrail-webui: charm: local:{{ ubuntu.release }}/contrail-webui num_units: {{ unit_qty() }} + install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" @@ -56,3 +60,11 @@ {% for unit_id in to_select() %} - "lxc:nodes={{ unit_id }}" {% endfor %} + kafka: + charm: local:{{ ubuntu.release }}/kafka: + num_units: {{ unit_qty() }} + to: +{% for unit_id in to_select() %} + - "lxc:nodes={{ unit_id }}" +{% endfor %} + |