diff --git a/ceph/templates/service.yaml b/ceph/templates/service.yaml index cdfd4f5590..1a5f85b88e 100644 --- a/ceph/templates/service.yaml +++ b/ceph/templates/service.yaml @@ -33,5 +33,4 @@ spec: selector: app: ceph daemon: rgw - type: LoadBalancer {{- end }} diff --git a/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl b/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl index 041af73752..5571408dc2 100644 --- a/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl +++ b/neutron/templates/bin/_openvswitch-ensure-configured.sh.tpl @@ -4,12 +4,9 @@ set -x bridge=$1 port=$2 -# one time deal -ovs-vsctl --no-wait --if-exists del-port physnet1 enp11s0f0 -ovs-vsctl --no-wait --if-exists del-br physnet1 - # note that only "br-ex" is definable right now - +# and br-int and br-tun are assumed and handled +# by the agent ovs-vsctl --no-wait --may-exist add-br $bridge ovs-vsctl --no-wait --may-exist add-port $bridge $port