From 109b2b7951ee8aab7bc9d58c9fb3aec99110cf33 Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 1 Dec 2017 12:49:19 +0400
Subject: [PATCH] [virtual] Update dpdk scenario with pike

Change-Id: I879f565fe17539a54770fa22a6088c6493524e0c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 mcp/config/states/dpdk                                             | 7 ++-----
 .../classes/cluster/virtual-mcp-pike-common/openstack_control.yml  | 5 +----
 .../classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml  | 2 --
 .../classes/cluster/virtual-mcp-pike-common/openstack_init.yml     | 2 +-
 .../cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml        | 7 +++++--
 mcp/reclass/classes/system                                         | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk
index eb00d7279..6aa2b488c 100755
--- a/mcp/config/states/dpdk
+++ b/mcp/config/states/dpdk
@@ -15,12 +15,9 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
 salt -I 'nova:compute' system.reboot
 wait_for 90 "! salt -I 'nova:compute' test.ping | " \
   "tee /dev/stderr | grep -Fq 'Not connected'"
-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' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk
+salt -I 'nova:compute' service.restart openvswitch-switch
 
 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/virtual-mcp-pike-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
index 458765020..44c1407c5 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_control.yml
@@ -8,7 +8,6 @@
 ---
 classes:
   - system.linux.system.lowmem
-  - system.linux.system.repo.mcp.extra
   - service.nfs.server
   - system.mongodb.server.single
   - system.mongodb.server.database.ceilometer
@@ -91,12 +90,10 @@ parameters:
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
       pkgs:
-        - nova-common
-        - nova-novncproxy
-        - novnc
         - nova-api
         - nova-conductor
         - nova-consoleauth
+        - nova-novncproxy
         - nova-scheduler
         - python-novaclient
   horizon:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
index 7d5313444..9822de7d3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_gateway.yml
@@ -6,8 +6,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 ---
-classes:
-  - system.linux.system.repo.mcp.extra
 parameters:
   _param:
     primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
index e3ae40505..cf35a2b20 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common/openstack_init.yml
@@ -97,7 +97,7 @@ parameters:
     system:
       repo:
         uca:
-          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/pike main"
+          source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
           architectures: amd64
           key_id: EC4926EA
           key_server: keyserver.ubuntu.com
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
index 72fe43a84..fdb421918 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-ovs-dpdk/openstack/compute.yml
@@ -7,8 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.openstack
-  - system.linux.system.repo.mcp.extra
   - system.nova.compute.nfv.hugepages
   - system.neutron.compute.nfv.dpdk
   - cluster.virtual-mcp-pike-common.openstack_compute
@@ -20,6 +18,11 @@ parameters:
         tenant_network_types: ${_param:neutron_tenant_network_types}
   linux:
     network:
+      dpdk_pkgs:
+        - dpdk
+        - dpdk-dev
+        - dpdk-igb-uio-dkms
+        - dpdk-rte-kni-dkms
       interface:
         dpdk0:
           name: ${_param:dpdk0_name}
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
index 58cebbd45..79f99eb5c 160000
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit 58cebbd45db86c92e89abd33b98827863306eee1
+Subproject commit 79f99eb5c290b346bb663ec8142eb3eafeb0a7e8
-- 
2.16.6