openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This patch resolves issue where ovn-cms-options is left when OVNCMSOptions
is changed to "" in RoleParameters on an existing OVN+DVR+HA environment.

Closes-Bug: #1922168
Change-Id: I649b2a1f7babd86d1fb6a2ebd68b22a3560eb885
(cherry picked from commit 180fcf18bf)
This commit is contained in:
Purandhar Sairam Mannidi 2021-03-26 18:43:01 +10:00
parent b6dbd9250e
commit 6c62cf789e
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
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: