openstack/openstack-helm
Code Issues Proposed changes

neutron-ovs-agent-init: remove neutron-sanity-check

Browse Source 
This change removes neutron-sanity-check from neutron-ovs-agent-init.
Proper dependencies now exist, as outlined in the original issue [0],
and the check is no longer required.

[0] https://github.com/att-comdev/openstack-helm/issues/88#issuecomment-270829530]

Depends-On: https://review.opendev.org/691035/
Change-Id: I6f8849ea519da76ac5289e86dbc7beb57cc9baba
Related-Bug: #1842517
This commit is contained in:
Sphicas, Phil (ps3910) 2019-10-24 11:58:08 -07:00
parent 3fa1771779
commit e83f50633d
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
neutron/templates/bin/_neutron-openvswitch-agent-init.sh.tpl
View File

@ -334,22 +334,6 @@ function init_ovs_dpdk_bridges {
done done
} }
# FIXME(portdirect): There is a neutron bug in Queens that needs resolved
# for now, if we cannot even get the version of neutron-sanity-check, skip
# this validation.
# see: https://bugs.launchpad.net/neutron/+bug/1769868
if neutron-sanity-check --version >/dev/null 2>/dev/null; then
# ensure we can talk to openvswitch or bail early
# this is until we can setup a proper dependency
# on deaemonsets - note that a show is not sufficient
# here, we need to communicate with both the db and vswitchd
# which means we need to do a create action
#
# see https://github.com/att-comdev/openstack-helm/issues/88
timeout 3m neutron-sanity-check --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --ovsdb_native --nokeepalived_ipv6_support
fi
# handle any bridge mappings # handle any bridge mappings
# /tmp/auto_bridge_add is one line json file: {"br-ex1":"eth1","br-ex2":"eth2"} # /tmp/auto_bridge_add is one line json file: {"br-ex1":"eth1","br-ex2":"eth2"}
for bmap in `sed 's/[{}"]//g' /tmp/auto_bridge_add | tr "," "\n"` for bmap in `sed 's/[{}"]//g' /tmp/auto_bridge_add | tr "," "\n"`