Indentation was lost. Restored. Also converted all stx-openstack
to use |prefix| and fixed worker topic |OVS-DPDK| substitution.
Implemented other changes identified in testing.
Incorporated patchset 1 review comments.
Fixed |vswitch-label|
Fixed merge conflict
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: Id1771885a7e0b97cb4900b12b68a5e94a452bcbf
Signed-off-by: Ron Stone <ronald.stone@windriver.com>
(cherry picked from commit f502df6856)
3f1cc84e58