Merge "Remove ovn-cms-options from OVS when OVNCMSOptions is set to """ into stable/victoria
This commit is contained in:
commit
f5e90b63b6
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue