[state] Fold aarch64 conditions

The armband formula already has checks in place to run only on
nodes with the expected arch, so remove the duplicate condition
in state files.

Change-Id: I05b26368a2d97422830a692e09242bc50e4eb1db
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index ff19a69..51db509 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -55,11 +55,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
   salt -I 'neutron:compute' state.sls neutron.compute
 fi
 
-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:role:primary' state.sls barbican
 salt -I 'barbican:server:role:secondary' state.sls barbican -b 1

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 98e2eff..32b965c 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -41,11 +41,7 @@ wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 salt -I 'neutron:server' state.sls 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