From b276cb24b079795051dc1f4af55ed53de72bb9bd Mon Sep 17 00:00:00 2001 From: Purandhar Sairam Mannidi Date: Fri, 26 Mar 2021 18:43:01 +1000 Subject: [PATCH] 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 180fcf18bfaf5c433902b6dd0d738e5f6523dd98) --- deployment/ovn/ovn-controller-container-puppet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 18b2f49a65..fb6c2cc015 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -260,7 +260,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: