openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove ovn-cms-options from OVS when OVNCMSOptions is set to """ into stable/ussuri

This commit is contained in:
Zuul 2021-04-23 11:19:08 +00:00 committed by Gerrit Code Review
parent 0c857861b9 59fcd220fd
commit ba29ae65cc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/ovn/ovn-controller-container-puppet.yaml
View File

@ -244,7 +244,7 @@ outputs:
net: host
privileged: true
user: root
command: ['/bin/bash', '-c', 'CMS_OPTS=$(hiera ovn::controller::ovn_cms_options -c /etc/puppet/hiera.yaml); if [ X"$CMS_OPTS" != X ]; then ovs-vsctl set open . external_ids:ovn-cms-options=$CMS_OPTS; fi']
command: ['/bin/bash', '-c', 'CMS_OPTS=$(hiera ovn::controller::ovn_cms_options -c /etc/puppet/hiera.yaml); if [ X"$CMS_OPTS" != X ]; then ovs-vsctl set open . external_ids:ovn-cms-options=$CMS_OPTS;else ovs-vsctl remove open . external_ids ovn-cms-options; fi']
image: &ovn_controller_image {get_param: ContainerOvnControllerImage}
volumes:
list_concat: