76086e2f2f
This commit addresses: * Separating out stacked ovs daemonset into separate daemonsets. * Fixes line ending issues. * Enhances agents ovs pre-flight checks by using neutron-sanity-check.
27 lines
1.1 KiB
Smarty
27 lines
1.1 KiB
Smarty
#!/bin/bash
|
|
set -x
|
|
chown neutron: /run/openvswitch/db.sock
|
|
|
|
# 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 --ovsdb_native --nokeepalived_ipv6_support
|
|
|
|
|
|
# determine local-ip dynamically based on interface provided but only if tunnel_types is not null
|
|
{{- if .Values.ml2.agent.tunnel_types }}
|
|
IP=$(ip a s {{ .Values.network.interface.tunnel | default .Values.network.interface.default}} | grep 'inet ' | awk '{print $2}' | awk -F "/" '{print $1}')
|
|
cat <<EOF>/tmp/ml2-local-ip.ini
|
|
[ovs]
|
|
local_ip = $IP
|
|
EOF
|
|
{{- else }}
|
|
touch /tmp/ml2-local-ip.ini
|
|
{{- end }}
|
|
|
|
exec sudo -E -u neutron neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2-conf.ini --config-file /tmp/ml2-local-ip.ini
|