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-neutron | |
| 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-neutron')
| -rw-r--r-- | mcp/patches/salt-formula-neutron/0001-Support-rocky-version.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/mcp/patches/salt-formula-neutron/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-neutron/0001-Support-rocky-version.patch new file mode 100644 index 000000000..41795486d --- /dev/null +++ b/mcp/patches/salt-formula-neutron/0001-Support-rocky-version.patch @@ -0,0 +1,71 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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, 11 Dec 2018 17:27:40 +0400 +Subject: [PATCH] Support rocky version + +Change-Id: Ie9439cf50b5dcfb73f63acd1f01c1dcb034358ee +Related-Prod: PROD-23722 + +diff --git a/metadata/service/compute/ovn/single.yml b/metadata/service/compute/ovn/single.yml +index 1665ac8..187f180 100644 +--- a/metadata/service/compute/ovn/single.yml ++++ b/metadata/service/compute/ovn/single.yml +@@ -33,3 +33,5 @@ parameters: + enabled: ${_param:openstack_fluentd_handler_enabled} + ossyslog: + enabled: ${_param:openstack_ossyslog_handler_enabled} ++ concurrency: ++ lock_path: /var/lock/neutron +diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml +index 96f4268..baeb03c 100644 +--- a/metadata/service/compute/single.yml ++++ b/metadata/service/compute/single.yml +@@ -47,3 +47,5 @@ parameters: + enabled: ${_param:openstack_fluentd_handler_enabled} + ossyslog: + enabled: ${_param:openstack_ossyslog_handler_enabled} ++ concurrency: ++ lock_path: /var/lock/neutron +diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml +index 33ddaa2..4753725 100644 +--- a/metadata/service/control/cluster.yml ++++ b/metadata/service/control/cluster.yml +@@ -46,6 +46,8 @@ parameters: + enabled: ${_param:openstack_fluentd_handler_enabled} + ossyslog: + enabled: ${_param:openstack_ossyslog_handler_enabled} ++ concurrency: ++ lock_path: /var/lock/neutron + message_queue: + engine: rabbitmq + host: ${_param:cluster_vip_address} +diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml +index 939856c..448d6fe 100644 +--- a/metadata/service/control/single.yml ++++ b/metadata/service/control/single.yml +@@ -50,6 +50,8 @@ parameters: + enabled: ${_param:openstack_fluentd_handler_enabled} + ossyslog: + enabled: ${_param:openstack_ossyslog_handler_enabled} ++ concurrency: ++ lock_path: /var/lock/neutron + message_queue: + engine: rabbitmq + host: ${_param:single_address} +diff --git a/metadata/service/gateway/single.yml b/metadata/service/gateway/single.yml +index 2649449..631e749 100644 +--- a/metadata/service/gateway/single.yml ++++ b/metadata/service/gateway/single.yml +@@ -42,3 +42,5 @@ parameters: + enabled: ${_param:openstack_fluentd_handler_enabled} + ossyslog: + enabled: ${_param:openstack_ossyslog_handler_enabled} ++ concurrency: ++ lock_path: /var/lock/neutron |