Fix race condition with nova privsep utime

Bug: https://bugs.launchpad.net/nova/+bug/1809123
Change-Id: I14622c21826aeeddac6ea7bf7f9d116cd3e68cfb
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/nova_nfs_utime b/mcp/config/states/nova_nfs_utime
new file mode 100755 (executable)
index 0000000..b8c0468
--- /dev/null
+++ b/mcp/config/states/nova_nfs_utime
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+##############################################################################
+# Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+salt -I 'nova:compute' pkg.install python-nova
+# https://bugs.launchpad.net/nova/+bug/1809123
+salt -I 'nova:compute' file.replace /usr/lib/python2.7/dist-packages/nova/privsep/path.py \
+  pattern="^\s{4}os\.utime\(path, None\)" \
+  repl="\n    with open(path, 'a'):\n        os.utime(path, None)"

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 85e3215..5027a8c 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -55,6 +55,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
   salt -I 'neutron:compute' state.sls neutron.compute
 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

diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index 7db100f..f5782ac 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -41,6 +41,7 @@ wait_for 3 "salt -I 'cinder:volume' state.sls cinder"
 salt -I 'neutron:server' state.sls etcd,neutron
 salt -I 'neutron:compute' state.sls neutron
 
+$(dirname "${BASH_SOURCE[0]}")/nova_nfs_utime
 salt -I 'nova:compute' state.sls nova,armband
 
 salt -I 'barbican:server' state.sls barbican