From 355c38a157ae6972d73357f088ec5223da0b6362 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Mon, 14 Jan 2019 17:18:50 +0400 Subject: Align patches * patch is merged into oslo-templates * rocky repo key name is made as for others * jinja package is updated to fix incorrect quoted value [https://github.com/saltstack/salt/issues/46594] Change-Id: Ia6359cf89579b4d892ae40c4d087168edcd86ebb Signed-off-by: Michael Polenchuk --- ...ndle-lock_path-option-of-oslo.concurrency.patch | 40 ---------------------- 1 file changed, 40 deletions(-) delete mode 100644 mcp/patches/salt-formula-oslo-templates/0001-Handle-lock_path-option-of-oslo.concurrency.patch (limited to 'mcp/patches/salt-formula-oslo-templates') 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 -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 %} -- cgit 1.2.3-korg