From f5c6f152b9e9a9f913ffd3ff0cc542ce32f9f4df Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 27 Jul 2017 08:55:04 -0500 Subject: changing the bundle which works for OCL. Change-Id: Id92622368fefca84c3d45eced6d6ca0e0b9790f5 Signed-off-by: Narinder Gupta --- ci/config_tpl/juju2/bundle_tpl/bundle.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ci/config_tpl/juju2/bundle_tpl/bundle.yaml') diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml index 575aa8f8..910d6073 100644 --- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml @@ -30,7 +30,6 @@ auto_peers: false {% endif %} {% include 'mysql.yaml' %} -{% include 'ceilometer.yaml' %} {% if opnfv.storage_dict.scaleio is defined %} {% include 'scaleio.yaml' %} {% else %} @@ -54,10 +53,11 @@ {% include 'nova-compute.yaml' %} {% include 'openstack-dashboard.yaml' %} {% include 'rabbitmq.yaml' %} -{% include 'heat.yaml' %} {% include 'neutron-api.yaml' %} {% if os.network.controller != 'ocl' %} {% include 'neutron-gateway.yaml' %} +{% include 'heat.yaml' %} +{% include 'ceilometer.yaml' %} {% endif %} {% include 'aodh.yaml' %} {% if os.network.controller == 'odl' %} -- cgit 1.2.3-korg