+
+salt -I 'nova:compute' state.sls armband
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index e507ec9..6c68e15 100755
+index b9db817..cec5895 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
salt -I 'nova:compute' state.sls nova
+salt -I 'nova:compute' state.sls armband
- salt -I 'mongodb:server' state.sls mongodb -b 1
- salt -I 'aodh:server' state.sls aodh
+ salt -I 'mongodb:server' state.sls mongodb
+ while true; do sleep 5; salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin' && break; done
diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff b/mcp/salt-formulas/armband/files/nova-libvirt-driver.diff
new file mode 100644
index 0000000..a5b08da
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
-index ee5f639..345a7d4 100644
+index 4aa7bb0..118d22d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -17,7 +17,7 @@ classes:
+ enp1s0: ${_param:linux_dhcp_interface}
+ enp2s0: ${_param:linux_single_interface}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
-index 30f2c46..72dac26 100644
+index 5e9a2c5..939fd7f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -17,7 +17,7 @@ classes:
wait_for 10 "salt -C 'mas01*' state.apply maas.region"
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 6c68e15..99483f3 100755
+index cec5895..9714c70 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
-@@ -51,5 +51,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
+@@ -55,5 +55,5 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
salt -I 'nginx:server' state.sls nginx
-Subproject commit f26e94914200be045abfd10d63d7120e9e0f6145
+Subproject commit cde147cf3aec7f79b0a4d2bd60d01c355e5861ec