labs: force LC_ALL=C for ssh

Mac OS X exports LC_CTYPE=UTF-8 to our ssh environment which makes the
keystone install fail (results in a Python traceback complaining about
"unknown locale: UTF-8").

This patch uses LC_ALL=C to override all locale settings.

The previous, limited work-arounds for neutron are no longer needed and
removed.

Change-Id: Ic7a2f5547fc4bd5d512da5197e48366c83c21c24
This commit is contained in:
Roger Luethi 2014-12-10 19:31:32 +01:00
parent b415ad8d99
commit cf0aa13715
3 changed files with 4 additions and 13 deletions

View File

@ -93,7 +93,10 @@ function vm_ssh {
check_vagrant_private_key
ssh -q \
# Some operating systems (e.g., Mac OS X) export locale settings to the
# target that cause some Python clients to fail. Override with a standard
# setting (LC_ALL=C).
LC_ALL=C ssh -q \
-i "$LIB_DIR/vagrant-ssh-keys/vagrant" \
-o "UserKnownHostsFile /dev/null" \
-o "StrictHostKeyChecking no" \

View File

@ -14,12 +14,6 @@ indicate_current_auto
# http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron_initial-external-network.html
#------------------------------------------------------------------------------
# Work around neutron client failing with unsupported locale settings
if [[ "$(neutron --help)" == "unsupported locale setting" ]]; then
echo "Locale not supported on node, setting LC_ALL=C."
export LC_ALL=C
fi
echo "Waiting for neutron to start."
until neutron net-list >/dev/null 2>&1; do
sleep 1

View File

@ -14,12 +14,6 @@ indicate_current_auto
# http://docs.openstack.org/icehouse/install-guide/install/apt/content/neutron_initial-tenant-network.html
#------------------------------------------------------------------------------
# Work around neutron client failing with unsupported locale settings
if [[ "$(neutron --help)" == "unsupported locale setting" ]]; then
echo "Locale not supported on node, setting LC_ALL=C."
export LC_ALL=C
fi
echo "Waiting for neutron to start."
until neutron net-list >/dev/null 2>&1; do
sleep 1