diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-12 15:42:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-12 15:42:14 +0000 |
| commit | 5c2d26dc7c9fd1abb531a8fedd9982383bf2367e (patch) | |
| tree | d0d5acbccdc6f417125fc9841bd5acb816e83018 /mcp | |
| parent | 0f9a80d1ae908c6dd5fb780ad91ba3bea2a9fb38 (diff) | |
| parent | 198a1980aa7341800c2c82ded62b5b43a845f445 (diff) | |
Merge "[baremetal] Fixup pike deployment (2)"
Diffstat (limited to 'mcp')
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 2 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-dpdk-ha/openstack/compute.yml | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 3856bef10..d92e99232 100755 --- 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 59bbf3869..d643da616 100644 --- 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} |