summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-09 15:47:47 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-01-09 15:47:47 +0100
commit7da37b3418836fa10d802206aed8a560f84cf640 (patch)
treef1a0204b24978b976c84a7b5351aaef40c7aea2c
parentad2bdf2eb08c0991757f30d370c90d5c9d814d3e (diff)
[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>
-rwxr-xr-xmcp/config/states/openstack_ha6
-rwxr-xr-xmcp/config/states/openstack_noha6
2 files changed, 2 insertions, 10 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index ff19a69b8..51db5094b 100755
--- 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 98e2eff73..32b965c6b 100755
--- 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