summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-07-27 08:55:04 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-07-27 08:55:45 -0500
commitf5c6f152b9e9a9f913ffd3ff0cc542ce32f9f4df (patch)
treeb4f0d213dccb7813ccc59860286562daba7f1f9b /ci/config_tpl/juju2/bundle_tpl/bundle.yaml
parentce06a995fd8986c5cb6502b4070a8f6e79bbe9f8 (diff)
changing the bundle which works for OCL.
Change-Id: Id92622368fefca84c3d45eced6d6ca0e0b9790f5 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/bundle.yaml')
-rw-r--r--ci/config_tpl/juju2/bundle_tpl/bundle.yaml4
1 files changed, 2 insertions, 2 deletions
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' %}