modified ceilometer contrail.

Change-Id: Id65d5dd4468d07c00a1d73e76f4ee77d73d70498
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>

diff --git a/ci/config_tpl/bundle_tpl/oclphase1.yaml b/ci/config_tpl/bundle_tpl/oclphase1.yaml
index ebb69c4..31f4ab0 100644 (file)
--- 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() %}

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 81f35ec..5550094 100755 (executable)
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -21,7 +21,7 @@ git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
 build congress
 
 git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
-#git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
 git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
 git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
 git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
@@ -72,5 +72,5 @@ bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail
 charm pull cs:trusty/apache-zookeeper $distro/zookeeper
 bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail
 bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
+bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer-contrail
 bzr branch lp:~sdn-charmers/charms/$distro/ceilometer-contrail/trunk $distro/ceilometer-contrail