Merge "Incorrect group name issue on non DPDK compute"
This commit is contained in:
commit
c7f19f0bd2
|
@ -120,12 +120,10 @@ outputs:
|
||||||
- get_attr: [NeutronOvsAgent, role_data, config_settings]
|
- get_attr: [NeutronOvsAgent, role_data, config_settings]
|
||||||
- keys:
|
- keys:
|
||||||
tripleo::neutron_ovs_agent::firewall_rules: tripleo::neutron_ovs_dpdk_agent::firewall_rules
|
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]
|
- get_attr: [RoleParametersValue, value]
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
map_merge:
|
get_attr: [NeutronOvsAgent, role_data, service_config_settings]
|
||||||
- get_attr: [NeutronOvsAgent, role_data, service_config_settings]
|
|
||||||
- nova_libvirt:
|
|
||||||
nova::compute::libvirt::qemu::group: {get_attr: [RoleParametersValue, value, vhostuser_socket_group]}
|
|
||||||
puppet_config:
|
puppet_config:
|
||||||
config_volume: neutron
|
config_volume: neutron
|
||||||
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
|
||||||
|
|
Loading…
Reference in New Issue