3 files changed, 10 insertions, 5 deletions
diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index 18b0826f9..b9c407280 100644
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -20,6 +20,7 @@ virtual:
         - saltstack 500 deb [arch=amd64] http://repo.saltstack.com/apt/ubuntu/16.04/amd64/2016.11 xenial main
     pkg:
       install:
+        - linux-generic-hwe-16.04
         - salt-minion
   control:
     pkg:
diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
index 58f418622..2dfea5f60 100644
--- a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
+++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
@@ -6,16 +6,17 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 {%- import 'net_map.j2' as nm with context %}
+{%- set cluster = {'has_virtual_nodes': False} %}
 {%- for node in conf.nodes %}
-  {%- if node.node.type == 'baremetal' %}
-    {%- set cluster_has_baremetal_nodes = True %}
+  {%- if not cluster.has_virtual_nodes and node.node.type == 'baremetal' %}
+    {%- set _ = cluster.update({'has_baremetal_nodes': True}) %}
   {%- endif %}
 {%- endfor %}
 ---
 cluster:
   domain: mcp-pike-ovs-novcp-ha.local
   states:
-{%- if cluster_has_baremetal_nodes %}
+{%- if cluster.has_baremetal_nodes %}
     - maas
     - baremetal_init
 {%- endif %}
@@ -24,7 +25,7 @@ cluster:
 virtual:
   nodes:
     - cfg01
-{%- if cluster_has_baremetal_nodes %}
+{%- if cluster.has_baremetal_nodes %}
     - mas01
 {%- endif %}
 {#- Most likely, controllers will always have the same type and number (3) #}
diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight
index 34a2c3bd8..0b774e691 100755
--- a/mcp/config/states/opendaylight
+++ b/mcp/config/states/opendaylight
@@ -9,7 +9,10 @@
 
 CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 
+# TODO: use service.masked state instead once salt get updated to 2017.7.0+
+salt -I 'opendaylight:server' service.mask opendaylight
 salt -I 'opendaylight:server' state.sls opendaylight
+
+salt -I 'neutron:server' state.sls opendaylight.client
 salt -I 'opendaylight:client' state.sls opendaylight.client
 salt -I 'opendaylight:client' cmd.run 'neutron-odl-ovs-hostconfig --noovs_dpdk'
-salt -I 'neutron:server' state.sls opendaylight.client