diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-01-16 11:31:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-16 11:31:44 +0000 |
| commit | 8b6cc776aa1e78f3734185f18e9fd45def6b88a2 (patch) | |
| tree | d3b16afd6d839261affc7b829cdc7889861fe0fa /mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch | |
| parent | 352e7bb783b5cb70a41acff26d4a7635ba9aeaec (diff) | |
| parent | 355c38a157ae6972d73357f088ec5223da0b6362 (diff) | |
Merge "Align patches"
Diffstat (limited to 'mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch')
| -rw-r--r-- | mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch b/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch deleted file mode 100644 index 61b19c30d..000000000 --- a/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch +++ /dev/null @@ -1,40 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2018 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 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Michael Polenchuk <mpolenchuk@mirantis.com> -Date: Tue, 18 Dec 2018 11:59:51 +0400 -Subject: [PATCH] Handle lock_path option of oslo.concurrency - -Neutron agents requires lock_path option to be set -to perform concurrency actions. - -Change-Id: If0a297fc2bb6f01bb8be9b31237f8e135d254a14 -Related-Prod: PROD-23722 - -diff --git a/oslo_templates/files/queens/oslo/_concurrency.conf b/oslo_templates/files/queens/oslo/_concurrency.conf -index 856ae0d..cd6b7ed 100644 ---- a/oslo_templates/files/queens/oslo/_concurrency.conf -+++ b/oslo_templates/files/queens/oslo/_concurrency.conf -@@ -16,3 +16,6 @@ disable_process_locking = {{ _data.disable_process_locking }} - # tempfile.gettempdir function to find a suitable location. If - # external locks are used, a lock path must be set. (string value) - #lock_path = /tmp -+{%- if _data.lock_path is defined %} -+lock_path = {{ _data.lock_path }} -+{%- endif %} -diff --git a/oslo_templates/files/rocky/oslo/_concurrency.conf b/oslo_templates/files/rocky/oslo/_concurrency.conf -index 856ae0d..cd6b7ed 100644 ---- a/oslo_templates/files/rocky/oslo/_concurrency.conf -+++ b/oslo_templates/files/rocky/oslo/_concurrency.conf -@@ -16,3 +16,6 @@ disable_process_locking = {{ _data.disable_process_locking }} - # tempfile.gettempdir function to find a suitable location. If - # external locks are used, a lock path must be set. (string value) - #lock_path = /tmp -+{%- if _data.lock_path is defined %} -+lock_path = {{ _data.lock_path }} -+{%- endif %} |