diff --git a/stack.sh b/stack.sh index 66b7dda2a3..545c07143d 100755 --- a/stack.sh +++ b/stack.sh @@ -769,6 +769,8 @@ if is_service_enabled q-agt; then else ### FIXME(dtroyer): Find RPMs for OpenVSwitch echo "OpenVSwitch packages need to be located" + # Fedora does not started OVS by default + restart_service openvswitch fi elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then install_package bridge-utils @@ -1230,6 +1232,13 @@ if is_service_enabled quantum; then Q_CONF_FILE=/etc/quantum/quantum.conf cp $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE + Q_RR_CONF_FILE=/etc/quantum/rootwrap.conf + cp -p $QUANTUM_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE + + # Copy over the config and filter bits + Q_CONF_ROOTWRAP_D=/etc/quantum/rootwrap.d + mkdir -p $Q_CONF_ROOTWRAP_D + cp -pr $QUANTUM_DIR/etc/quantum/rootwrap.d/* $Q_CONF_ROOTWRAP_D/ fi # Quantum service (for controller node) @@ -1336,6 +1345,8 @@ if is_service_enabled q-agt; then if [[ "$OVS_BRIDGE_MAPPINGS" != "" ]]; then iniset /$Q_PLUGIN_CONF_FILE OVS bridge_mappings $OVS_BRIDGE_MAPPINGS fi + # Update config w/rootwrap + iniset /$Q_PLUGIN_CONF_FILE OVS root_helper #Q_RR_CONF_FILE AGENT_BINARY="$QUANTUM_DIR/bin/quantum-openvswitch-agent" elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then # Setup physical network interface mappings. Override @@ -1347,6 +1358,8 @@ if is_service_enabled q-agt; then if [[ "$LB_INTERFACE_MAPPINGS" != "" ]]; then iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE physical_interface_mappings $LB_INTERFACE_MAPPINGS fi + # Update config w/rootwrap + iniset /$Q_PLUGIN_CONF_FILE LINUX_BRIDGE root_helper #Q_RR_CONF_FILE AGENT_BINARY="$QUANTUM_DIR/bin/quantum-linuxbridge-agent" fi fi @@ -1367,6 +1380,9 @@ if is_service_enabled q-dhcp; then quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url + # Update config w/rootwrap + iniset /$Q_DHCP_CONF_FILE DEFAULT root_helper #Q_RR_CONF_FILE + if [[ "$Q_PLUGIN" = "openvswitch" ]]; then iniset $Q_DHCP_CONF_FILE DEFAULT interface_driver quantum.agent.linux.interface.OVSInterfaceDriver elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then @@ -1548,8 +1564,7 @@ if is_service_enabled n-cpu; then QEMU_CONF=/etc/libvirt/qemu.conf if is_service_enabled quantum && [[ $Q_PLUGIN = "openvswitch" ]] && ! sudo grep -q '^cgroup_device_acl' $QEMU_CONF ; then # Add /dev/net/tun to cgroup_device_acls, needed for type=ethernet interfaces - sudo chmod 666 $QEMU_CONF - sudo cat <> /etc/libvirt/qemu.conf + cat <