Merge "Make use of openvswitch elements"
This commit is contained in:
commit
298595cc96
|
@ -0,0 +1 @@
|
||||||
|
openvswitch
|
|
@ -1,24 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
install-packages openvswitch-switch python-netaddr
|
install-packages python-netaddr
|
||||||
|
|
||||||
if [ "$DIB_INIT_SYSTEM" == "systemd" ] ; then
|
|
||||||
os-svc-enable -n openvswitch-switch
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$DIB_INIT_SYSTEM" == "upstart" ] ; then
|
|
||||||
echo "start on starting cloud-init-nonet" >> /etc/init/openvswitch-switch.override
|
|
||||||
if [ ! -f /etc/init/openvswitch-switch.conf ] ; then
|
|
||||||
cat << 'EOF' > /etc/init/openvswitch-switch.conf
|
|
||||||
# openvswitch-switch
|
|
||||||
# the purpose of this job is
|
|
||||||
# * start openvwitch-switch in upstart rather than SysV startup
|
|
||||||
pre-start script
|
|
||||||
export RUNLEVEL=2
|
|
||||||
/etc/init.d/openvswitch-switch start
|
|
||||||
end script
|
|
||||||
post-stop exec /etc/init.d/openvswitch-switch stop
|
|
||||||
EOF
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
|
@ -3,5 +3,6 @@ os-apply-config
|
||||||
os-is-bootstrap-host
|
os-is-bootstrap-host
|
||||||
os-refresh-config
|
os-refresh-config
|
||||||
os-svc-install
|
os-svc-install
|
||||||
|
openvswitch-datapath
|
||||||
selinux
|
selinux
|
||||||
source-repositories
|
source-repositories
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eux
|
set -eux
|
||||||
|
|
||||||
install-packages openvswitch-switch openvswitch-datapath-dkms
|
|
||||||
|
|
||||||
# for BUG: https://bugs.launchpad.net/neutron/+bug/1225232
|
# for BUG: https://bugs.launchpad.net/neutron/+bug/1225232
|
||||||
echo "qpid-python" | tee -a /opt/stack/neutron/requirements.txt
|
echo "qpid-python" | tee -a /opt/stack/neutron/requirements.txt
|
||||||
|
|
||||||
|
@ -21,8 +19,4 @@ echo "Defaults:neutron !requiretty" >> /etc/sudoers.d/neutron
|
||||||
chmod 0440 /etc/sudoers.d/neutron
|
chmod 0440 /etc/sudoers.d/neutron
|
||||||
visudo -c
|
visudo -c
|
||||||
|
|
||||||
if [ "$DIB_INIT_SYSTEM" == "systemd" ]; then
|
|
||||||
os-svc-enable -n openvswitch-switch
|
|
||||||
fi
|
|
||||||
|
|
||||||
add-selinux-path-substitution /usr/bin $NEUTRON_VENV_DIR/bin
|
add-selinux-path-substitution /usr/bin $NEUTRON_VENV_DIR/bin
|
||||||
|
|
Loading…
Reference in New Issue