summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-03-19 18:04:55 +0000
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-03-19 18:05:21 +0000
commit05ab3b9ec74e772769da98ed37579bd35b00d579 (patch)
tree0c31f3b992c98c66548da8a7eb1030924f6e9ac9 /mcp
parent36e16f10055c74b46bbc25b85f9adf60b546b136 (diff)
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>
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/nova_nfs_utime14
-rwxr-xr-xmcp/config/states/openstack_ha1
-rwxr-xr-xmcp/config/states/openstack_noha1
3 files changed, 0 insertions, 16 deletions
diff --git a/mcp/config/states/nova_nfs_utime b/mcp/config/states/nova_nfs_utime
deleted file mode 100755
index b8c046866..000000000
--- 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 a00c21fb3..51db5094b 100755
--- 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 0f745565c..f79d9f657 100755
--- 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