Browse Source

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

changes/54/787954/1
Zuul 7 months ago
committed by Gerrit Code Review
parent
commit
ba29ae65cc
  1. 2
      deployment/ovn/ovn-controller-container-puppet.yaml

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

@ -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:

Loading…
Cancel
Save