Incorrect group name issue on non DPDK compute

This change is to fix the incorrect grouo name issue on non DPDK compute
node, currently pushes incorrect group 'hugetlbfs' to non DPDK node
instead of group 'qemu' when DPDK environment with 2 different roles
for compute nodes DPDK and non-DPDK.

Change-Id: I9462e0451b3be054568d951252fa7b1d3802c180
Closes-Bug: #1837034

deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml

@@ -120,12 +120,10 @@ outputs:
             - get_attr: [NeutronOvsAgent, role_data, config_settings]
             - keys:
                 tripleo::neutron_ovs_agent::firewall_rules: tripleo::neutron_ovs_dpdk_agent::firewall_rules
+          - nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
           - get_attr: [RoleParametersValue, value]
       service_config_settings:
-        map_merge:
-          - get_attr: [NeutronOvsAgent, role_data, service_config_settings]
-          - nova_libvirt:
-              nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
+        get_attr: [NeutronOvsAgent, role_data, service_config_settings]
       puppet_config:
         config_volume: neutron
         puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2