3 files changed, 34 insertions, 3 deletions
diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
index b52a89cf4..747adbee2 100644
--- a/mcp/config/scenario/os-nosdn-fdio-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml
@@ -24,4 +24,35 @@ virtual:
     vcpus: 4
     ram: 14336
   gtw01:
-    ram: 2048
+    vcpus: 8
+    ram: 8192
+    cpu_topology:
+      sockets: 1
+      cores: 4
+      threads: 2
+    numa:
+      cell0:
+        memory: 8388608
+        cpus: 0-7
+  cmp001:
+    vcpus: 8
+    ram: 8192
+    cpu_topology:
+      sockets: 1
+      cores: 4
+      threads: 2
+    numa:
+      cell0:
+        memory: 8388608
+        cpus: 0-7
+  cmp002:
+    vcpus: 8
+    ram: 8192
+    cpu_topology:
+      sockets: 1
+      cores: 4
+      threads: 2
+    numa:
+      cell0:
+        memory: 8388608
+        cpus: 0-7
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index 358e1874d..ba7ae30e5 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -27,7 +27,7 @@ salt -C "${cluster_nodes_query}" file.replace $debian_ip_source \
   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
 
 salt -C "${cluster_nodes_query}" pkg.install bridge-utils
-salt -C "${control_nodes_query}" state.apply linux.network,linux.system.kernel
+salt -C "${control_nodes_query}" state.apply linux.system.repo,linux.network,linux.system.kernel
 wait_for 5.0 "salt -C '${cluster_nodes_query}' state.apply salt.minion"
 wait_for 5.0 "salt -C '${compute_nodes_query}' state.apply linux.system,linux.network"
 wait_for 30.0 "salt -C '${cluster_nodes_query}' test.ping"
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 98e2eff73..01f686b1f 100755
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -38,7 +38,7 @@ salt -I 'heat:server' state.sls heat
 salt -I 'cinder:controller' state.sls cinder
 wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 
-salt -I 'neutron:server' state.sls neutron
+salt -I 'neutron:server' state.sls etcd,neutron
 salt -I 'neutron:compute' state.sls neutron
 
 salt -I 'nova:compute' state.sls nova