openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix the step_config input in the OvS-DPDK template 

Also add the /etc/modules.d mount point for container-puppet
scripts, so that vfio module load conf file is created.

Change-Id: If585d8d807c350273d152f1fb4ef2615ac1d1b81
Closes-Bug: #1828413
(cherry picked from commit 0c19fa2b90)
This commit is contained in:
Saravanan KR 2019-05-09 18:47:44 +05:30 committed by Emilien Macchi
parent cbb49c3ca5
commit ba1e217430
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: