[OVS] Move references to node-related configs to a file
This would allow to make use of the nodes-config feature. Change-Id: Idf5285edddfb532c1c599922b593b14673ad5c22
This commit is contained in:
parent
9a738c9de8
commit
257534c9d0
|
@ -1,7 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
bridge=$1
|
||||
port=$2
|
||||
{% for net in neutron.physnets %}
|
||||
|
||||
bridge={{ net.bridge_name }}
|
||||
port={{ net.interface }}
|
||||
|
||||
ip link set $port up
|
||||
|
||||
|
@ -17,3 +19,5 @@ if [[ ! $(ovs-vsctl list-ports $bridge) =~ $(echo "\<$port\>") ]]; then
|
|||
fi
|
||||
|
||||
echo $changed
|
||||
|
||||
{% endfor %}
|
|
@ -33,10 +33,8 @@ service:
|
|||
- opendaylight
|
||||
# {% endif %}
|
||||
# {% if neutron.plugin_agent != "opendaylight" %}
|
||||
# {% for net in neutron.physnets %}
|
||||
- name: vswitchd-setup-ovs-bridge-{{ net.name }}
|
||||
command: /usr/local/bin/ovs-ensure-configured.sh {{ net.bridge_name }} {{ net.interface }}
|
||||
# {% endfor %}
|
||||
- name: vswitchd-setup-ovs-bridge
|
||||
command: /usr/local/bin/ovs-ensure-configured.sh
|
||||
# {% endif %}
|
||||
daemon:
|
||||
command: /usr/sbin/ovs-vswitchd unix:/run/openvswitch/db.sock --mlockall
|
||||
|
@ -56,7 +54,7 @@ service:
|
|||
files:
|
||||
ovs-ensure-configured.sh:
|
||||
path: /usr/local/bin/ovs-ensure-configured.sh
|
||||
content: ovs-ensure-configured.sh
|
||||
content: ovs-ensure-configured.sh.j2
|
||||
perm: "0755"
|
||||
ovs-set-managed-by-odl.sh:
|
||||
path: /usr/local/bin/ovs-set-managed-by-odl.sh
|
||||
|
|
Loading…
Reference in New Issue