@@ -134,6 +134,31 @@ if is_fedora; then

             sudo systemctl start iptables

         fi

     fi

+

+    if  [[ "$os_RELEASE" -ge "21" ]]; then

+        # requests ships vendored version of chardet/urllib3, but on

+        # fedora these are symlinked back to the primary versions to

+        # avoid duplication of code on disk.  This is fine when

+        # maintainers keep things in sync, but since devstack takes

+        # over and installs later versions via pip we can end up with

+        # incompatible versions.

+        #

+        # The rpm package is not removed to preserve the dependent

+        # packages like cloud-init; rather we remove the symlinks and

+        # force a re-install of requests so the vendored versions it

+        # wants are present.

+        #

+        # Realted issues:

+        # https://bugs.launchpad.net/glance/+bug/1476770

+        # https://bugzilla.redhat.com/show_bug.cgi?id=1253823

+

+        base_path=/usr/lib/python2.7/site-packages/requests/packages

+        if [ -L $base_path/chardet -o -L $base_path/urllib3 ]; then

+            sudo rm -f /usr/lib/python2.7/site-packages/requests/packages/{chardet,urllib3}

+            # install requests with the bundled urllib3 to avoid conflicts

+            pip_install --upgrade --force-reinstall requests

+        fi

+    fi

 fi

 # The version of pip(1.5.4) supported by python-virtualenv(1.11.4) has