[baremetal] Fixup pike deployment (2)

* align dpdk packages list
* add missing libvirtd group to vcp host nodes

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

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 3856bef..d92e992 100755 (executable)
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -27,6 +27,8 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
 fi
 
 # KVM libvirt first, VCP deployment
+#FIXME Should be removed once upstream patch get merged
+salt -C 'kvm*' group.add libvirtd
 wait_for 5 "salt -C 'kvm*' state.sls libvirt"
 
 salt -C 'kvm* or cmp*' state.apply salt

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
index 59bbf38..d643da6 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml
@@ -22,6 +22,11 @@ parameters:
       libvirt_bin: /etc/default/libvirtd
   linux:
     network:
+      dpdk_pkgs:
+        - dpdk
+        - dpdk-dev
+        - dpdk-igb-uio-dkms
+        - dpdk-rte-kni-dkms
       interface:
         dpdk0:
           name: ${_param:dpdk0_name}