openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove ovn-cms-options from OVS when OVNCMSOptions is set to """

This commit is contained in:
Zuul 2021-04-13 17:49:09 +00:00 committed by Gerrit Code Review
parent 5d73f71def 180fcf18bf
commit 8760c06678
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

@ -251,7 +251,7 @@ outputs:
net: host net: host
privileged: true privileged: true
user: root 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} image: &ovn_controller_image {get_param: ContainerOvnControllerImage}
volumes: volumes:
list_concat: list_concat: