openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix the step_config input in the OvS-DPDK template"

This commit is contained in:
Zuul 2019-05-10 00:39:37 +00:00 committed by Gerrit Code Review
parent aab027cd8b 0c19fa2b90
commit aaa72c461b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
View File

@ -131,7 +131,7 @@ outputs:
config_volume: neutron
puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2
step_config:
get_attr: [NeutronOvsAgent, role_data, step_config]
get_attr: [NeutronOvsAgent, role_data, puppet_config, step_config]
config_image: {get_param: DockerNeutronConfigImage}
# We need to mount /run for puppet_config step. This is because
# puppet-vswitch runs the commands "ovs-vsctl list open_vswitch ."
@ -141,6 +141,7 @@ outputs:
volumes:
- /lib/modules:/lib/modules:ro
- /run/openvswitch:/run/openvswitch
- /etc/modules-load.d/:/etc/modules-load.d
kolla_config:
get_attr: [NeutronOvsAgent, role_data, kolla_config]
container_config_scripts: