From 44db065d7944b02b6948fbda4e504d6e9df0f640 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 6 Oct 2016 23:39:49 -0500 Subject: modified ceilometer contrail. Change-Id: Id65d5dd4468d07c00a1d73e76f4ee77d73d70498 Signed-off-by: Narinder Gupta --- ci/config_tpl/bundle_tpl/oclphase1.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ci/config_tpl/bundle_tpl') diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml index ebb69c4e..31f4ab04 100644 --- a/ci/config_tpl/bundle_tpl/oclphase1.yaml +++ b/ci/config_tpl/bundle_tpl/oclphase1.yaml @@ -19,10 +19,11 @@ charm: local:{{ ubuntu.release }}/contrail-configuration num_units: {{ unit_qty() }} options: + openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" + install-sources: 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 }}" @@ -31,6 +32,7 @@ charm: local:{{ ubuntu.release }}/contrail-control num_units: {{ unit_qty() }} options: + openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} @@ -40,6 +42,7 @@ charm: local:{{ ubuntu.release }}/contrail-analytics num_units: {{ unit_qty() }} options: + openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" install-sources: ppa:opencontrail/trunk-20160812 to: {% for unit_id in to_select() %} -- cgit 1.2.3-korg