Skip to content

Commit 71f23eb

Browse files
gabrielhurleyDean Troyer
authored andcommitted
Converts all tables and connections to UTF8.
This is https://review.openstack.org/4221 resurrected as the original was auto-abandoned. Nova database is handled in db migrations; this adds the nova.conf change noted by Naveed Massjouni in the original proposal. Connections to quantum and melange DB changed to utf8 References bug 933208. Change-Id: Ifc4e5cd71cafb719da62214aafc394563ed1aa29
1 parent c7adb0a commit 71f23eb

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

stack.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ if is_service_enabled g-reg; then
803803

804804
# (re)create glance database
805805
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS glance;'
806-
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE glance;'
806+
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE glance CHARACTER SET utf8;'
807807

808808
function glance_config {
809809
sudo sed -e "
@@ -814,7 +814,7 @@ if is_service_enabled g-reg; then
814814
s,%KEYSTONE_SERVICE_HOST%,$KEYSTONE_SERVICE_HOST,g;
815815
s,%KEYSTONE_SERVICE_PORT%,$KEYSTONE_SERVICE_PORT,g;
816816
s,%KEYSTONE_SERVICE_PROTOCOL%,$KEYSTONE_SERVICE_PROTOCOL,g;
817-
s,%SQL_CONN%,$BASE_SQL_CONN/glance,g;
817+
s,%SQL_CONN%,$BASE_SQL_CONN/glance?charset=utf8,g;
818818
s,%SERVICE_TENANT_NAME%,$SERVICE_TENANT_NAME,g;
819819
s,%SERVICE_USERNAME%,glance,g;
820820
s,%SERVICE_PASSWORD%,$SERVICE_PASSWORD,g;
@@ -1262,7 +1262,7 @@ add_nova_opt "flat_network_bridge=$FLAT_NETWORK_BRIDGE"
12621262
if [ -n "$FLAT_INTERFACE" ]; then
12631263
add_nova_opt "flat_interface=$FLAT_INTERFACE"
12641264
fi
1265-
add_nova_opt "sql_connection=$BASE_SQL_CONN/nova"
1265+
add_nova_opt "sql_connection=$BASE_SQL_CONN/nova?charset=utf8"
12661266
add_nova_opt "libvirt_type=$LIBVIRT_TYPE"
12671267
add_nova_opt "instance_name_template=${INSTANCE_NAME_PREFIX}%08x"
12681268
# All nova-compute workers need to know the vnc configuration options
@@ -1426,12 +1426,12 @@ fi
14261426
if is_service_enabled key; then
14271427
# (re)create keystone database
14281428
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS keystone;'
1429-
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE keystone;'
1429+
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE keystone CHARACTER SET utf8;'
14301430

14311431
# Configure keystone.conf
14321432
KEYSTONE_CONF=$KEYSTONE_DIR/etc/keystone.conf
14331433
cp $FILES/keystone.conf $KEYSTONE_CONF
1434-
sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/keystone,g" -i $KEYSTONE_CONF
1434+
sudo sed -e "s,%SQL_CONN%,$BASE_SQL_CONN/keystone?charset=utf8,g" -i $KEYSTONE_CONF
14351435
sudo sed -e "s,%DEST%,$DEST,g" -i $KEYSTONE_CONF
14361436
sudo sed -e "s,%SERVICE_TOKEN%,$SERVICE_TOKEN,g" -i $KEYSTONE_CONF
14371437
sudo sed -e "s,%KEYSTONE_DIR%,$KEYSTONE_DIR,g" -i $KEYSTONE_CONF
@@ -1523,7 +1523,7 @@ if is_service_enabled q-svc; then
15231523
# Create database for the plugin/agent
15241524
if is_service_enabled mysql; then
15251525
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS ovs_quantum;'
1526-
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE IF NOT EXISTS ovs_quantum;'
1526+
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE IF NOT EXISTS ovs_quantum CHARACTER SET utf8;'
15271527
else
15281528
echo "mysql must be enabled in order to use the $Q_PLUGIN Quantum plugin."
15291529
exit 1
@@ -1549,7 +1549,7 @@ if is_service_enabled q-agt; then
15491549
# Start up the quantum <-> openvswitch agent
15501550
QUANTUM_OVS_CONFIG_FILE=$QUANTUM_CONF_DIR/ovs_quantum_plugin.ini
15511551
sudo cp $QUANTUM_DIR/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini $QUANTUM_OVS_CONFIG_FILE
1552-
sudo sed -i -e "s/^sql_connection =.*$/sql_connection = mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/ovs_quantum/g" $QUANTUM_OVS_CONFIG_FILE
1552+
sudo sed -i -e "s/^sql_connection =.*$/sql_connection = mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/ovs_quantum?charset=utf8/g" $QUANTUM_OVS_CONFIG_FILE
15531553
screen_it q-agt "sleep 4; sudo python $QUANTUM_DIR/quantum/plugins/openvswitch/agent/ovs_quantum_agent.py $QUANTUM_OVS_CONFIG_FILE -v"
15541554
fi
15551555

@@ -1559,14 +1559,14 @@ fi
15591559
if is_service_enabled m-svc; then
15601560
if is_service_enabled mysql; then
15611561
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'DROP DATABASE IF EXISTS melange;'
1562-
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE melange;'
1562+
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -e 'CREATE DATABASE melange CHARACTER SET utf8;'
15631563
else
15641564
echo "mysql must be enabled in order to use the $Q_PLUGIN Quantum plugin."
15651565
exit 1
15661566
fi
15671567
MELANGE_CONFIG_FILE=$MELANGE_DIR/etc/melange/melange.conf
15681568
cp $MELANGE_CONFIG_FILE.sample $MELANGE_CONFIG_FILE
1569-
sed -i -e "s/^sql_connection =.*$/sql_connection = mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/melange/g" $MELANGE_CONFIG_FILE
1569+
sed -i -e "s/^sql_connection =.*$/sql_connection = mysql:\/\/$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST\/melange?charset=utf8/g" $MELANGE_CONFIG_FILE
15701570
cd $MELANGE_DIR && PYTHONPATH=.:$PYTHONPATH python $MELANGE_DIR/bin/melange-manage --config-file=$MELANGE_CONFIG_FILE db_sync
15711571
screen_it m-svc "cd $MELANGE_DIR && PYTHONPATH=.:$PYTHONPATH python $MELANGE_DIR/bin/melange-server --config-file=$MELANGE_CONFIG_FILE"
15721572
echo "Waiting for melange to start..."

0 commit comments

Comments
 (0)