diff --git a/tripleo_common/tests/utils/test_overcloudrc.py b/tripleo_common/tests/utils/test_overcloudrc.py
index e3d280617..41e6c4f75 100644
--- a/tripleo_common/tests/utils/test_overcloudrc.py
+++ b/tripleo_common/tests/utils/test_overcloudrc.py
@@ -34,9 +34,11 @@ class OvercloudRcTest(base.TestCase):
             ]
         }
 
-        result = overcloudrc.create_overcloudrc(stack, "", "AdminPassword",
+        result = overcloudrc.create_overcloudrc(stack, "foo", "AdminPassword",
                                                 "regionTwo")
 
+        self.assertIn("export no_proxy='foo,foo.com,[fd00::1]'",
+                      result['overcloudrc'])
         self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc'])
         self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc.v3'])
         self.assertIn("OS_IDENTITY_API_VERSION=3", result['overcloudrc'])
diff --git a/tripleo_common/utils/overcloudrc.py b/tripleo_common/utils/overcloudrc.py
index 236337931..b042c68cb 100644
--- a/tripleo_common/utils/overcloudrc.py
+++ b/tripleo_common/utils/overcloudrc.py
@@ -18,6 +18,11 @@ from six.moves import urllib
 
 from tripleo_common import constants
 
+try:  # py3
+    from shlex import quote
+except ImportError:  # py2
+    from pipes import quote
+
 
 def get_service_ips(stack):
     service_ips = {}
@@ -109,7 +114,8 @@ def create_overcloudrc(stack, no_proxy, admin_password, region_name):
 
     overcloudrc = CLEAR_ENV
     for key, value in rc_params.items():
-        line = "export %(key)s=%(value)s\n" % {'key': key, 'value': value}
+        line = "export %(key)s=%(value)s\n" % {'key': key,
+                                               'value': quote(value)}
         overcloudrc = overcloudrc + line
     overcloudrc = overcloudrc + CLOUDPROMPT