Revert "Fix race condition with nova privsep utime"

This reverts commit ac56d7b14f46b05f497b3dca4b6a4b0bfedd83e2.
The original patch has been merged (https://review.openstack.org/643011)

Change-Id: I3a7cd825f371e375d36256143b4b8c91f90ee26e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/nova_nfs_utime b/mcp/config/states/nova_nfs_utime
deleted file mode 100755 (executable)
index b8c0468..0000000
--- a/mcp/config/states/nova_nfs_utime
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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 a00c21f..51db509 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -55,7 +55,6 @@ 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 0f74556..f79d9f6 100755 (executable)
--- a/mcp/config/states/openstack_noha
+++ b/mcp/config/states/openstack_noha
@@ -41,7 +41,6 @@ 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