Merge "[state] Fold aarch64 conditions"

diff --cc mcp/config/states/openstack_noha
index 01f686b,32b965c..f79d9f6
--- 1/mcp/config/states/openstack_noha
--- 2/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@@ -38,14 -38,10 +38,10 @@@ salt -I 'heat:server' state.sls hea
  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
- if salt -I 'nova:compute' match.grain 'cpuarch:aarch64' \
-   --out yaml --static | grep -q -e 'true' ; then
-   salt -C 'G@cpuarch:aarch64 and I@nova:compute' state.sls armband
- fi
+ salt -I 'nova:compute' state.sls nova,armband
  
  salt -I 'barbican:server' state.sls barbican
  salt -I 'barbican:client' state.sls barbican