aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-08 15:26:17 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-09-08 15:35:10 +0400
commit32b75cc293bf0402302ee674a0a0064456d219c7 (patch)
tree7dac7cdef19aaed3212b89c0f5b95937b5ee551a
parentac7bb381c5376c28b0eeac880af90b50a2801f38 (diff)
[ovs/dpdk] Mend dpdk settings
* add vcpus to virtual compute * re-pin dpdk core & pmds * switch to UCA repos * disable apt-daily cron job Change-Id: Ia23100b846d8954e3d5e8a264a6b8518402b2fa6 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml2
-rwxr-xr-xmcp/config/states/dpdk9
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml3
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml10
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml8
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml10
-rw-r--r--mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml4
7 files changed, 40 insertions, 6 deletions
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index ab882215b..540761cbf 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -18,6 +18,8 @@ virtual:
gtw01:
ram: 2048
cmp01:
+ vcpus: 4
ram: 6144
cmp02:
+ vcpus: 4
ram: 6144
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index c4abbb100..c1ec07e27 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -5,5 +5,14 @@ salt -I 'nova:compute' system.reboot
while true; do salt -I 'nova:compute' test.ping | fgrep -q 'Not connected' || break; done
salt -I 'nova:compute' state.sls linux.network
+# switch to UCA repos since fuel-infra packages have bugs
+salt -I 'nova:compute' cmd.run 'rm -vrf /etc/apt/preferences.d/*'
+salt -I 'nova:compute' file.remove '/etc/apt/sources.list.d/mirantis_openstack.list'
+salt -I 'nova:compute' pkg.refresh_db
+
+salt -I 'nova:compute' pkg.install neutron-common
+salt -I 'nova:compute' file.append /etc/sudoers.d/neutron_sudoers \
+ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf'
+
salt -I 'nova:compute' pkg.install libvirt-bin
salt -I 'nova:compute' file.chown /var/run/openvswitch libvirt-qemu kvm
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
index 8ea676181..0bd74f832 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
@@ -63,6 +63,9 @@ parameters:
enabled: true
sudo: true
home: /home/ubuntu
+ service:
+ apt-daily.timer:
+ status: dead
network:
host:
cfg01:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index a534e225f..39747e49d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -35,7 +35,17 @@ parameters:
dpdk: True
backend:
tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
+ nova:
+ compute:
+ libvirt_service: libvirtd
linux:
+ system:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+ architectures: amd64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
network:
bridge: openvswitch
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
index 016fcb8f5..e582e0d37 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
@@ -99,11 +99,11 @@ parameters:
compute_hugepages_size: 1G
compute_hugepages_count: 12
compute_hugepages_mount: /mnt/hugepages_1G
- compute_kernel_isolcpu: 2,5,6,7,9,10,13,14,15
+ compute_kernel_isolcpu: 2,3,5,6,7,10,11,13,14,15
compute_dpdk_driver: uio
- compute_ovs_pmd_cpu_mask: "0x2060"
- compute_ovs_dpdk_socket_mem: "1024,1024"
- compute_ovs_dpdk_lcore_mask: "0x1000"
+ compute_ovs_pmd_cpu_mask: "0xc04"
+ compute_ovs_dpdk_socket_mem: "2048,2048"
+ compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
glance_version: ${_param:openstack_version}
glance_service_host: ${_param:openstack_control_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index 4396e315a..c747c0d85 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -8,7 +8,17 @@ parameters:
compute:
backend:
tenant_network_types: ${_param:neutron_tenant_network_types}
+ nova:
+ compute:
+ libvirt_service: libvirtd
linux:
+ system:
+ repo:
+ uca:
+ source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
+ architectures: amd64
+ key_id: EC4926EA
+ key_server: keyserver.ubuntu.com
network:
interface:
dpdk0:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
index c034ddfad..14501050f 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
@@ -7,7 +7,7 @@ parameters:
compute_hugepages_count: 1024
compute_hugepages_mount: /mnt/hugepages_2M
compute_dpdk_driver: uio
- compute_ovs_pmd_cpu_mask: "0x2"
+ compute_ovs_pmd_cpu_mask: "0x6"
compute_ovs_dpdk_socket_mem: "1024"
- compute_ovs_dpdk_lcore_mask: "0x1"
+ compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"