Skip to content

Commit 4402d6e

Browse files
aaronorosenaaronorosen
committed
update stack.sh due to quantum changes
The following git commit a86c31ba1544528cd8473896076e8b1b4ef14bce changes the following variables in ovs_quantum_plugin.ini from (enable-tunneling, local-ip) to enable_tunneling, local_ip). Therefore the quantum configuration section of stack.sh needs to also update these variable names. Fixes bug 1015333 Removes the logic used for plugins.ini which is no longer needed and adds a mv to copy policy.json Fixes bug 1015418 Change-Id: Ib4f39b3095bab3db116395e750cef695113340e8
1 parent 8d2c8fa commit 4402d6e

1 file changed

Lines changed: 9 additions & 16 deletions

File tree

‎stack.sh‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,20 +1116,15 @@ if is_service_enabled quantum; then
11161116
echo "OVS 1.4+ is required for tunneling between multiple hosts."
11171117
exit 1
11181118
fi
1119-
sudo sed -i -e "s/.*enable-tunneling = .*$/enable-tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE
1119+
sudo sed -i -e "s/.*enable_tunneling = .*$/enable_tunneling = $OVS_ENABLE_TUNNELING/g" /$Q_PLUGIN_CONF_FILE
11201120
fi
11211121
fi
11221122

11231123
# Quantum service (for controller node)
11241124
if is_service_enabled q-svc; then
1125-
# must remove this file from existing location, otherwise Quantum will prefer it
1126-
if [[ -e $QUANTUM_DIR/etc/plugins.ini ]]; then
1127-
# Support prior to common config
1128-
Q_PLUGIN_INI_FILE=/etc/quantum/plugins.ini
1129-
sudo mv $QUANTUM_DIR/etc/plugins.ini $Q_PLUGIN_INI_FILE
1130-
fi
11311125
Q_CONF_FILE=/etc/quantum/quantum.conf
11321126
Q_API_PASTE_FILE=/etc/quantum/api-paste.ini
1127+
Q_POLICY_FILE=/etc/quantum/policy.json
11331128

11341129
if [[ -e $QUANTUM_DIR/etc/quantum.conf ]]; then
11351130
sudo mv $QUANTUM_DIR/etc/quantum.conf $Q_CONF_FILE
@@ -1139,6 +1134,10 @@ if is_service_enabled q-svc; then
11391134
sudo mv $QUANTUM_DIR/etc/api-paste.ini $Q_API_PASTE_FILE
11401135
fi
11411136

1137+
if [[ -e $QUANTUM_DIR/etc/policy.json ]]; then
1138+
sudo mv $QUANTUM_DIR/etc/policy.json $Q_POLICY_FILE
1139+
fi
1140+
11421141
if is_service_enabled mysql; then
11431142
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e "DROP DATABASE IF EXISTS $Q_DB_NAME;"
11441143
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e "CREATE DATABASE IF NOT EXISTS $Q_DB_NAME CHARACTER SET utf8;"
@@ -1147,14 +1146,8 @@ if is_service_enabled q-svc; then
11471146
exit 1
11481147
fi
11491148

1150-
# Update either configuration file with plugin or old plugin file
1151-
# file checked below exists only in common config version
1152-
if [[ -e $QUANTUM_DIR/quantum/tests/etc/quantum.conf.test ]]; then
1153-
sudo sed -i -e "s/^core_plugin =.*$/core_plugin = $Q_PLUGIN_CLASS/g" $Q_CONF_FILE
1154-
else
1155-
sudo sed -i -e "s/^provider =.*$/provider = $Q_PLUGIN_CLASS/g" $Q_PLUGIN_INI_FILE
1156-
fi
1157-
1149+
# Update either configuration file with plugin
1150+
sudo sed -i -e "s/^core_plugin =.*$/core_plugin = $Q_PLUGIN_CLASS/g" $Q_CONF_FILE
11581151
screen_it q-svc "cd $QUANTUM_DIR && python $QUANTUM_DIR/bin/quantum-server --config-file $Q_CONF_FILE"
11591152
fi
11601153

@@ -1179,7 +1172,7 @@ if is_service_enabled q-agt; then
11791172
sudo ovs-vsctl --no-wait -- --if-exists del-br $OVS_BRIDGE
11801173
sudo ovs-vsctl --no-wait add-br $OVS_BRIDGE
11811174
sudo ovs-vsctl --no-wait br-set-external-id $OVS_BRIDGE bridge-id br-int
1182-
sudo sed -i -e "s/.*local-ip = .*/local-ip = $HOST_IP/g" /$Q_PLUGIN_CONF_FILE
1175+
sudo sed -i -e "s/.*local_ip = .*/local_ip = $HOST_IP/g" /$Q_PLUGIN_CONF_FILE
11831176
AGENT_BINARY=$QUANTUM_DIR/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
11841177
elif [[ "$Q_PLUGIN" = "linuxbridge" ]]; then
11851178
# Start up the quantum <-> linuxbridge agent

0 commit comments

Comments
 (0)