summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-ha.yaml1
-rw-r--r--mcp/config/scenario/os-nosdn-ovs-noha.yaml5
-rw-r--r--mcp/config/scenario/os-odl-ovs-noha.yaml5
-rwxr-xr-xmcp/config/states/dpdk19
-rw-r--r--mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch25
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml4
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j24
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j24
m---------mcp/scripts/pharos0
10 files changed, 43 insertions, 26 deletions
diff --git a/mcp/config/scenario/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/os-nosdn-ovs-ha.yaml
index e42d17210..9be6540c7 100644
--- a/mcp/config/scenario/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-ha.yaml
@@ -9,7 +9,6 @@
cluster:
domain: mcp-ovs-dpdk-ha.local
states:
- - dpdk
- openstack_ha
- networks
virtual:
diff --git a/mcp/config/scenario/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
index e1cc6d768..30a55fe35 100644
--- a/mcp/config/scenario/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/os-nosdn-ovs-noha.yaml
@@ -9,7 +9,6 @@
cluster:
domain: mcp-ovs-dpdk-noha.local
states:
- - dpdk
- openstack_noha
- neutron_gateway
- networks
@@ -27,7 +26,7 @@ virtual:
ram: 4096
cmp001:
vcpus: 6
- ram: 10240
+ ram: 14336
cmp002:
vcpus: 6
- ram: 10240
+ ram: 14336
diff --git a/mcp/config/scenario/os-odl-ovs-noha.yaml b/mcp/config/scenario/os-odl-ovs-noha.yaml
index 0acb5d213..b24538754 100644
--- a/mcp/config/scenario/os-odl-ovs-noha.yaml
+++ b/mcp/config/scenario/os-odl-ovs-noha.yaml
@@ -9,7 +9,6 @@
cluster:
domain: mcp-odl-noha.local
states:
- - dpdk
- opendaylight
- openstack_noha
- neutron_gateway
@@ -32,7 +31,7 @@ virtual:
ram: 6144
cmp001:
vcpus: 6
- ram: 10240
+ ram: 14336
cmp002:
vcpus: 6
- ram: 10240
+ ram: 14336
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
deleted file mode 100755
index 65832db84..000000000
--- a/mcp/config/states/dpdk
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-
-CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
-
-# shellcheck disable=SC1090
-source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
-
-salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
-salt -I 'nova:compute' service.restart openvswitch-switch
-
-# Set datapath type to netdev for public bridge
-salt -I 'nova:compute' cmd.run 'ovs-vsctl br-exists br-floating && ovs-vsctl set bridge br-floating datapath_type=netdev' ignore_retcode=True
diff --git a/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch b/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch
new file mode 100644
index 000000000..4a35a8a79
--- /dev/null
+++ b/mcp/patches/salt-formula-linux/0004-dpdk-Enable-per-port-memory-model.patch
@@ -0,0 +1,25 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2019 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: Mon, 1 Apr 2019 13:09:37 +0400
+Subject: [PATCH] [dpdk] Enable per port memory model
+
+
+diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls
+index 786f7c8..48c00f5 100644
+--- a/linux/network/dpdk.sls
++++ b/linux/network/dpdk.sls
+@@ -49,6 +49,7 @@ linux_network_dpdk_ovs_service:
+ - unless: 'ovs-vsctl get Open_vSwitch . other_config | grep "dpdk-init=\"true\""'
+
+ {%- set ovs_options = [
++ 'per-port-memory="true"',
+ "pmd-cpu-mask=\""+network.openvswitch.pmd_cpu_mask+"\"",
+ "dpdk-socket-mem=\""+network.openvswitch.dpdk_socket_mem+"\"",
+ "dpdk-lcore-mask=\""+network.openvswitch.dpdk_lcore_mask+"\"",
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
index 93548f6bd..aaa5e65f0 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml
@@ -30,6 +30,10 @@ parameters:
services:
ceilometer:
status: absent
+ # required only for Rally validation
+ cinder:
+ type: volume
+ description: OpenStack Volume Service
server:
identity:
admin:
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 77476ac63..c5e004ad1 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
@@ -102,6 +102,10 @@ parameters:
services:
ceilometer:
status: absent
+ # required only for Rally validation
+ cinder:
+ type: volume
+ description: OpenStack Volume Service
server:
identity:
admin:
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
index 25fc82624..63eb6e250 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2
@@ -16,6 +16,8 @@ classes:
parameters:
neutron:
compute:
+ dhcp_agent_enabled: true
+ metadata_agent_enabled: true
backend:
tenant_network_types: ${_param:neutron_tenant_network_types}
linux:
diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
index 2707c7f5e..54835ac4f 100644
--- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2
@@ -15,6 +15,10 @@ classes:
- cluster.mcp-common-noha.openstack_compute
- cluster.mcp-ovs-noha
parameters:
+ neutron:
+ compute:
+ dhcp_agent_enabled: true
+ metadata_agent_enabled: true
linux:
network:
interface:
diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos
-Subproject 94f99be1ddd263506231ec5b72b576a6c63d82c
+Subproject 4fd183a336dd1047f0468ae2699860c67116c2b