diff options
17 files changed, 28 insertions, 144 deletions
diff --git a/mcp/config/scenario/defaults.yaml.j2 b/mcp/config/scenario/defaults.yaml.j2 index 4c6a86f03..4d1215f55 100644 --- a/mcp/config/scenario/defaults.yaml.j2 +++ b/mcp/config/scenario/defaults.yaml.j2 @@ -10,8 +10,8 @@ x86_64: base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img default: - vcpus: 2 - ram: 4096 + vcpus: 4 + ram: 8192 cluster: &arch_default_cluster_states states: - virtual_init diff --git a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml index 46c8bddc1..76fed8c12 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-nosdn-nofeature-noha.yaml @@ -21,10 +21,9 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: - ram: 2048 + ram: 4096 cmp001: vcpus: 8 ram: 16384 diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml index de8873daf..e1cc6d768 100644 --- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml +++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml @@ -22,13 +22,12 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: - ram: 2048 + ram: 4096 cmp001: - vcpus: 4 + vcpus: 6 ram: 10240 cmp002: - vcpus: 4 + vcpus: 6 ram: 10240 diff --git a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml index d7c2788e6..b4db80986 100644 --- a/mcp/config/scenario/os-odl-bgpvpn-noha.yaml +++ b/mcp/config/scenario/os-odl-bgpvpn-noha.yaml @@ -24,16 +24,13 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: + vcpus: 2 ram: 2048 odl01: - vcpus: 4 ram: 6144 cmp001: - vcpus: 4 - ram: 16384 + ram: 12288 cmp002: - vcpus: 4 - ram: 16384 + ram: 12288 diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index 05632055e..c9847b9ba 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -23,10 +23,9 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: + vcpus: 2 ram: 2048 odl01: - vcpus: 4 ram: 6144 diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml index 591e0f261..0acb5d213 100644 --- a/mcp/config/scenario/os-odl-ovs-noha.yaml +++ b/mcp/config/scenario/os-odl-ovs-noha.yaml @@ -24,16 +24,15 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: - ram: 1024 + vcpus: 2 + ram: 2048 odl01: - vcpus: 4 ram: 6144 cmp001: - vcpus: 4 + vcpus: 6 ram: 10240 cmp002: - vcpus: 4 + vcpus: 6 ram: 10240 diff --git a/mcp/config/scenario/os-odl-sfc-noha.yaml b/mcp/config/scenario/os-odl-sfc-noha.yaml index 8b0600f98..f2932c653 100644 --- a/mcp/config/scenario/os-odl-sfc-noha.yaml +++ b/mcp/config/scenario/os-odl-sfc-noha.yaml @@ -24,10 +24,9 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 gtw01: + vcpus: 2 ram: 2048 odl01: - vcpus: 4 ram: 6144 diff --git a/mcp/config/scenario/os-ovn-nofeature-noha.yaml b/mcp/config/scenario/os-ovn-nofeature-noha.yaml index 0369f3fe9..8dd682c39 100644 --- a/mcp/config/scenario/os-ovn-nofeature-noha.yaml +++ b/mcp/config/scenario/os-ovn-nofeature-noha.yaml @@ -19,11 +19,10 @@ virtual: - cmp001 - cmp002 ctl01: - vcpus: 4 ram: 14336 cmp001: - vcpus: 5 - ram: 8192 + vcpus: 6 + ram: 10240 cmp002: - vcpus: 5 - ram: 8192 + vcpus: 6 + ram: 10240 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 diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml index 93acf13e8..0416d26db 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -72,10 +72,13 @@ parameters: gateway: vlan_aware_vms: true root_helper_daemon: false + dhcp_lease_duration: 3600 + report_interval: 120 nova: compute: disk_cachemodes: file=directsync,block=none preallocate_images: space + heal_instance_info_cache_interval: 300 barbican: enabled: ${_param:barbican_integration_enabled} image: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index 0770f5c45..9cb54da7e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -87,6 +87,7 @@ parameters: <<: *db_conn_recycle_time vlan_aware_vms: true root_helper_daemon: false + agent_down_time: 300 global_physnet_mtu: ${_param:interface_mtu} backend: external_mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml index 41841c922..15418c71e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute.yml @@ -27,6 +27,7 @@ parameters: libvirt_bin: /etc/default/libvirtd disk_cachemodes: file=directsync,block=none vncproxy_url: http://${_param:cluster_vip_address}:6080 + heal_instance_info_cache_interval: 300 bind: vnc_address: ${_param:single_address} network: @@ -43,6 +44,7 @@ parameters: notification: true vlan_aware_vms: true root_helper_daemon: false + report_interval: 120 agent_mode: ${_param:neutron_compute_agent_mode} message_queue: host: ${_param:openstack_control_address} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index d36d5830a..cdbb20138 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -184,6 +184,7 @@ parameters: server: vlan_aware_vms: true root_helper_daemon: false + agent_down_time: 300 global_physnet_mtu: ${_param:interface_mtu} backend: external_mtu: ${_param:interface_mtu} diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml index 499749d82..5d9c62a7e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -18,3 +18,5 @@ parameters: agent_mode: ${_param:neutron_gateway_agent_mode} vlan_aware_vms: true root_helper_daemon: false + dhcp_lease_duration: 3600 + report_interval: 120 diff --git a/mcp/salt-formulas/salt-formula-neutron b/mcp/salt-formulas/salt-formula-neutron -Subproject 365f43c2fab5546d56fd0a68fa8105500e6a7fa +Subproject ff64d9c8db6dc60c9c95c940df36a1f536951de diff --git a/mcp/salt-formulas/salt-formula-nova b/mcp/salt-formulas/salt-formula-nova -Subproject 430d1f71274acbd33c3e628ee3a5d5e926bffd5 +Subproject f7c76187fb1cfbc81f23ae82dcfe58bfc358273 |