From 4e4b7928649577beed448004acb9ed5f33700301 Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Tue, 26 Feb 2019 18:09:14 +0400 Subject: Tune up nova/neutron intervals Also re-align resources for virtual scenarios. Change-Id: Id0d55407fd5b1720a24e30c364219f8b08e89d06 Signed-off-by: Michael Polenchuk --- .../0002-Support-rocky-version.patch | 71 ---------------------- 1 file changed, 71 deletions(-) delete mode 100644 mcp/patches/salt-formula-neutron/0002-Support-rocky-version.patch (limited to 'mcp/patches/salt-formula-neutron') diff --git a/mcp/patches/salt-formula-neutron/0002-Support-rocky-version.patch b/mcp/patches/salt-formula-neutron/0002-Support-rocky-version.patch deleted file mode 100644 index 41795486d..000000000 --- a/mcp/patches/salt-formula-neutron/0002-Support-rocky-version.patch +++ /dev/null @@ -1,71 +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, 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 -- cgit 1.2.3-korg