mcp/patches/salt-formula-neutron/0002-Support-rocky-version.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2018 Mirantis Inc., Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Michael Polenchuk <mpolenchuk@mirantis.com>
  10 Date: Tue, 11 Dec 2018 17:27:40 +0400
  11 Subject: [PATCH] Support rocky version
  12
  13 Change-Id: Ie9439cf50b5dcfb73f63acd1f01c1dcb034358ee
  14 Related-Prod: PROD-23722
  15
  16 diff --git a/metadata/service/compute/ovn/single.yml b/metadata/service/compute/ovn/single.yml
  17 index 1665ac8..187f180 100644
  18 --- a/metadata/service/compute/ovn/single.yml
  19 +++ b/metadata/service/compute/ovn/single.yml
  20 @@ -33,3 +33,5 @@ parameters:
  21              enabled: ${_param:openstack_fluentd_handler_enabled}
  22            ossyslog:
  23              enabled: ${_param:openstack_ossyslog_handler_enabled}
  24 +      concurrency:
  25 +        lock_path: /var/lock/neutron
  26 diff --git a/metadata/service/compute/single.yml b/metadata/service/compute/single.yml
  27 index 96f4268..baeb03c 100644
  28 --- a/metadata/service/compute/single.yml
  29 +++ b/metadata/service/compute/single.yml
  30 @@ -47,3 +47,5 @@ parameters:
  31              enabled: ${_param:openstack_fluentd_handler_enabled}
  32            ossyslog:
  33              enabled: ${_param:openstack_ossyslog_handler_enabled}
  34 +      concurrency:
  35 +        lock_path: /var/lock/neutron
  36 diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
  37 index 33ddaa2..4753725 100644
  38 --- a/metadata/service/control/cluster.yml
  39 +++ b/metadata/service/control/cluster.yml
  40 @@ -46,6 +46,8 @@ parameters:
  41              enabled: ${_param:openstack_fluentd_handler_enabled}
  42            ossyslog:
  43              enabled: ${_param:openstack_ossyslog_handler_enabled}
  44 +      concurrency:
  45 +        lock_path: /var/lock/neutron
  46        message_queue:
  47          engine: rabbitmq
  48          host: ${_param:cluster_vip_address}
  49 diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
  50 index 939856c..448d6fe 100644
  51 --- a/metadata/service/control/single.yml
  52 +++ b/metadata/service/control/single.yml
  53 @@ -50,6 +50,8 @@ parameters:
  54              enabled: ${_param:openstack_fluentd_handler_enabled}
  55            ossyslog:
  56              enabled: ${_param:openstack_ossyslog_handler_enabled}
  57 +      concurrency:
  58 +        lock_path: /var/lock/neutron
  59        message_queue:
  60          engine: rabbitmq
  61          host: ${_param:single_address}
  62 diff --git a/metadata/service/gateway/single.yml b/metadata/service/gateway/single.yml
  63 index 2649449..631e749 100644
  64 --- a/metadata/service/gateway/single.yml
  65 +++ b/metadata/service/gateway/single.yml
  66 @@ -42,3 +42,5 @@ parameters:
  67              enabled: ${_param:openstack_fluentd_handler_enabled}
  68            ossyslog:
  69              enabled: ${_param:openstack_ossyslog_handler_enabled}
  70 +      concurrency:
  71 +        lock_path: /var/lock/neutron