From 745afdd67acf84b89b2c3df861cf60318c6e1cfc Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Mon, 12 Mar 2018 10:21:50 +0200
Subject: [PATCH] [ci] Fix murano job

murano requires heat, so we need to add proper devstack plugin to the
desired job.

PS: manual enabling heat services are redundant, everything should work
    with just enabled plugin

Change-Id: I62febd935b75b4a126d5ce29984f63636463cb3a
---
 .zuul.d/rally-task-heat.yaml   | 6 ------
 .zuul.d/rally-task-murano.yaml | 1 +
 .zuul.d/zuul.yaml              | 5 ++---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.zuul.d/rally-task-heat.yaml b/.zuul.d/rally-task-heat.yaml
index 65616852..577468e0 100644
--- a/.zuul.d/rally-task-heat.yaml
+++ b/.zuul.d/rally-task-heat.yaml
@@ -12,12 +12,6 @@
         rally-openstack: https://git.openstack.org/openstack/rally-openstack
         heat: https://git.openstack.org/openstack/heat
       devstack_services:
-        cinder: true
-        heat: True
-        h-api: True
-        h-api-cfn: True
-        h-api-cw: True
-        h-eng: True
         # disable redundant services for the job
         ceilometer-acentral: false
         ceilometer-acompute: false
diff --git a/.zuul.d/rally-task-murano.yaml b/.zuul.d/rally-task-murano.yaml
index e815e238..ecde131c 100644
--- a/.zuul.d/rally-task-murano.yaml
+++ b/.zuul.d/rally-task-murano.yaml
@@ -12,6 +12,7 @@
       devstack_plugins:
         rally-openstack: https://git.openstack.org/openstack/rally-openstack
         murano: https://git.openstack.org/openstack/murano
+        heat: https://git.openstack.org/openstack/heat
       devstack_services:
         murano: true
         # disable redundant services for the job
diff --git a/.zuul.d/zuul.yaml b/.zuul.d/zuul.yaml
index a5efecb1..cbd4c084 100644
--- a/.zuul.d/zuul.yaml
+++ b/.zuul.d/zuul.yaml
@@ -54,9 +54,7 @@
         - rally-task-mistral
         # it did not work for a long time. try to re-configure it
         #- rally-task-monasca
-        - rally-task-murano:
-            # some workloads began fail. need more time to investigate
-            voting: false
+        - rally-task-murano
         - rally-task-neutron
         - rally-task-neutron-with-extensions:
             # more services should be enabled
@@ -81,6 +79,7 @@
         - rally-task-ironic
         - rally-task-keystone-glance-swift
         - rally-task-mistral
+        - rally-task-murano
         - rally-task-neutron
         - rally-task-telemetry
         - rally-task-zaqar