Tune up nova/neutron intervals

Also re-align resources for virtual scenarios.

Change-Id: Id0d55407fd5b1720a24e30c364219f8b08e89d06
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

2 files changed, 0 insertions, 116 deletions

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 <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
diff --git a/mcp/patches/salt-formula-nova/0001-Support-rocky-version.patch b/mcp/patches/salt-formula-nova/0001-Support-rocky-version.patch
deleted file mode 100644
index f9b08f7a9..000000000
--- a/mcp/patches/salt-formula-nova/0001-Support-rocky-version.patch
+++ /dev/null
@@ -1,45 +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 <mpolenchuk@mirantis.com>
-Date: Wed, 28 Nov 2018 17:55:45 +0400
-Subject: [PATCH] Support rocky version
-
-Change-Id: Ie7061f1b68ef3b203d4e169b60996a97ee6778c6
-Related-Prod: PROD-23724
-
-diff --git a/nova/map.jinja b/nova/map.jinja
-index 370f517..d977d8d 100644
---- a/nova/map.jinja
-+++ b/nova/map.jinja
-@@ -18,12 +18,14 @@
- } %}
-
- {%- if grains.os_family == "Debian" %}
--{%- set pkgs_list = [ 'nova-common', 'nova-consoleproxy', 'novnc', 'nova-api', 'nova-conductor', 'nova-consoleauth', 'nova-doc', 'nova-scheduler', 'python-novaclient', 'python-memcache', 'gettext-base', 'python-pycadf'] %}
-+{%- set pkgs_list = ['nova-api', 'nova-conductor', 'nova-consoleauth', 'nova-scheduler', 'python-novaclient'] %}
- {%- set services_list = ['nova-conductor', 'nova-api', 'nova-consoleauth', 'nova-scheduler', 'nova-novncproxy'] %}
--{%- if pillar.nova.controller is defined and pillar.nova.controller.get('version',{}) in ["juno", "kilo", "liberty", "mitaka"] %}
-+{%- set ost_version = pillar.nova.controller is defined and pillar.nova.controller.get('version', None) %}
-+{%- if ost_version in ['juno', 'kilo', 'liberty', 'mitaka'] %}
- {%- do pkgs_list.append('nova-cert') %}
- {%- do services_list.append('nova-cert') %}
- {%- endif %}
-+{%- do pkgs_list.append('nova-novncproxy' if ost_version in ['rocky'] else 'nova-consoleproxy') %}
- {%- endif %}
-
- {%- if grains.os_family == "RedHat" %}
-@@ -174,7 +176,7 @@ BaseDefaults: {{ default_params }}
- Debian:
-   pkgs:
-   - nova-common
--  - nova-compute-kvm
-+  - nova-compute
-   - python-novaclient
-   - pm-utils
-   - sysfsutils