1 files changed, 5 insertions, 3 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
index 5a49b9a7..910d6073 100644
--- a/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/bundle.yaml
@@ -13,7 +13,7 @@
 {% else %}
       num_units: 1
 {% endif %}
-      constraints: tags=control
+
     nodes-compute:
       charm: "cs:{{ ubuntu.release }}/ubuntu"
 {% if os.ha.mode == 'ha' %}
@@ -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,9 +53,12 @@
 {% 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' %}
 {% include 'odl.yaml' %}