diff --git a/labs/lib/osbash/functions.host b/labs/lib/osbash/functions.host index 53c09d9b..f9b7dc5d 100644 --- a/labs/lib/osbash/functions.host +++ b/labs/lib/osbash/functions.host @@ -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" \ diff --git a/labs/scripts/config_external_network.sh b/labs/scripts/config_external_network.sh index 21d33476..41ecfa8a 100755 --- a/labs/scripts/config_external_network.sh +++ b/labs/scripts/config_external_network.sh @@ -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 diff --git a/labs/scripts/config_tenant_network.sh b/labs/scripts/config_tenant_network.sh index 995c9500..b811e211 100755 --- a/labs/scripts/config_tenant_network.sh +++ b/labs/scripts/config_tenant_network.sh @@ -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