aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states/openstack_ha
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-02-26 14:52:06 +0400
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2019-02-28 15:02:45 +0100
commit788de2558aff99adddcc3a916dc1c8d888f1368c (patch)
tree78372562fb5e6ebf00563731beb2b0c6f6bfc369 /mcp/config/states/openstack_ha
parentcefde6d0e0a3674c2150f5014dcb90bf79c6d894 (diff)
Fix race condition with nova privsep utimestable/gambia
Bug: https://bugs.launchpad.net/nova/+bug/1809123 Change-Id: I14622c21826aeeddac6ea7bf7f9d116cd3e68cfb Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit ac56d7b14f46b05f497b3dca4b6a4b0bfedd83e2)
Diffstat (limited to 'mcp/config/states/openstack_ha')
-rwxr-xr-xmcp/config/states/openstack_ha7
1 files changed, 2 insertions, 5 deletions
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 924dc30f1..bb984c6e5 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -56,11 +56,8 @@ 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
+$(dirname "${BASH_SOURCE[0]}")/nova_nfs_utime
+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