diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-12-20 15:32:48 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-12-21 17:21:16 +0400 |
| commit | e821b9398a5a998bec0143d56efb93018b8bcd8c (patch) | |
| tree | 8434b89ce9044fab4ef580a8bdbd4d96a6ca075f /mcp/patches/salt-formula-oslo-templates | |
| parent | a31343155a621469f6e803b23dc6cc8bbb545dfa (diff) | |
Pull out rocky patches
This commit should be reverted once original formulas
get required support of rocky version.
Change-Id: Ia3458381bced0cae8dbfacc9781c90933ad5c822
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/patches/salt-formula-oslo-templates')
| -rw-r--r-- | mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch | 40 |
1 files changed, 40 insertions, 0 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 new file mode 100644 index 000000000..61b19c30d --- /dev/null +++ b/mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch @@ -0,0 +1,40 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 %} |