diff --git a/doc/source/install/common/openrc.inc b/doc/source/install/common/openrc.inc
index 6b030d33db..751c657070 100644
--- a/doc/source/install/common/openrc.inc
+++ b/doc/source/install/common/openrc.inc
@@ -29,6 +29,12 @@ scripts to load appropriate credentials for client operations.
 
 #. Create and edit the ``admin-openrc`` file and add the following content:
 
+   .. note::
+
+      The OpenStack client also supports using a ``clouds.yaml`` file.
+      For more information, see
+      the `os-client-config <http://docs.openstack.org/os-client-config/latest>`_.
+
    .. code-block:: bash
 
       export OS_PROJECT_DOMAIN_NAME=Default
@@ -36,7 +42,7 @@ scripts to load appropriate credentials for client operations.
       export OS_PROJECT_NAME=admin
       export OS_USERNAME=admin
       export OS_PASSWORD=ADMIN_PASS
-      export OS_AUTH_URL=https://controller:5000/v3
+      export OS_AUTH_URL=http://controller:5000/v3
       export OS_IDENTITY_API_VERSION=3
       export OS_IMAGE_API_VERSION=2
 
@@ -54,7 +60,7 @@ scripts to load appropriate credentials for client operations.
       export OS_PROJECT_NAME=myproject
       export OS_USERNAME=myuser
       export OS_PASSWORD=DEMO_PASS
-      export OS_AUTH_URL=https://controller:5000/v3
+      export OS_AUTH_URL=http://controller:5000/v3
       export OS_IDENTITY_API_VERSION=3
       export OS_IMAGE_API_VERSION=2
 
diff --git a/doc/source/install/keystone-install-rdo.rst b/doc/source/install/keystone-install-rdo.rst
index 672c24f232..67f8d274d1 100644
--- a/doc/source/install/keystone-install-rdo.rst
+++ b/doc/source/install/keystone-install-rdo.rst
@@ -138,9 +138,9 @@ Install and configure components
    .. code-block:: console
 
       # keystone-manage bootstrap --bootstrap-password ADMIN_PASS \
-        --bootstrap-admin-url https://controller:5000/v3/ \
-        --bootstrap-internal-url https://controller:5000/v3/ \
-        --bootstrap-public-url https://controller:5000/v3/ \
+        --bootstrap-admin-url http://controller:5000/v3/ \
+        --bootstrap-internal-url http://controller:5000/v3/ \
+        --bootstrap-public-url http://controller:5000/v3/ \
         --bootstrap-region-id RegionOne
 
    .. end
@@ -201,7 +201,7 @@ Finalize the installation
       $ export OS_PROJECT_NAME=admin
       $ export OS_USER_DOMAIN_NAME=Default
       $ export OS_PROJECT_DOMAIN_NAME=Default
-      $ export OS_AUTH_URL=https://controller:5000/v3
+      $ export OS_AUTH_URL=http://controller:5000/v3
       $ export OS_IDENTITY_API_VERSION=3
 
    .. end
diff --git a/doc/source/install/keystone-install-ubuntu.rst b/doc/source/install/keystone-install-ubuntu.rst
index e87c9eb418..7edc26730e 100644
--- a/doc/source/install/keystone-install-ubuntu.rst
+++ b/doc/source/install/keystone-install-ubuntu.rst
@@ -142,9 +142,9 @@ Install and configure components
    .. code-block:: console
 
       # keystone-manage bootstrap --bootstrap-password ADMIN_PASS \
-        --bootstrap-admin-url https://controller:5000/v3/ \
-        --bootstrap-internal-url https://controller:5000/v3/ \
-        --bootstrap-public-url https://controller:5000/v3/ \
+        --bootstrap-admin-url http://controller:5000/v3/ \
+        --bootstrap-internal-url http://controller:5000/v3/ \
+        --bootstrap-public-url http://controller:5000/v3/ \
         --bootstrap-region-id RegionOne
 
    .. end
@@ -194,7 +194,7 @@ Finalize the installation
       $ export OS_PROJECT_NAME=admin
       $ export OS_USER_DOMAIN_NAME=Default
       $ export OS_PROJECT_DOMAIN_NAME=Default
-      $ export OS_AUTH_URL=https://controller:5000/v3
+      $ export OS_AUTH_URL=http://controller:5000/v3
       $ export OS_IDENTITY_API_VERSION=3
 
    .. end
diff --git a/doc/source/install/keystone-verify-rdo.rst b/doc/source/install/keystone-verify-rdo.rst
index d9753992d7..c957a78edf 100644
--- a/doc/source/install/keystone-verify-rdo.rst
+++ b/doc/source/install/keystone-verify-rdo.rst
@@ -21,7 +21,7 @@ services.
 
    .. code-block:: console
 
-      $ openstack --os-auth-url https://controller:5000/v3 \
+      $ openstack --os-auth-url http://controller:5000/v3 \
         --os-project-domain-name Default --os-user-domain-name Default \
         --os-project-name admin --os-username admin token issue
 
@@ -47,7 +47,7 @@ services.
 
    .. code-block:: console
 
-      $ openstack --os-auth-url https://controller:5000/v3 \
+      $ openstack --os-auth-url http://controller:5000/v3 \
         --os-project-domain-name Default --os-user-domain-name Default \
         --os-project-name myproject --os-username myuser token issue
 
diff --git a/doc/source/install/keystone-verify-ubuntu.rst b/doc/source/install/keystone-verify-ubuntu.rst
index 486d6dd337..77ef15e4a4 100644
--- a/doc/source/install/keystone-verify-ubuntu.rst
+++ b/doc/source/install/keystone-verify-ubuntu.rst
@@ -21,7 +21,7 @@ services.
 
    .. code-block:: console
 
-      $ openstack --os-auth-url https://controller:5000/v3 \
+      $ openstack --os-auth-url http://controller:5000/v3 \
         --os-project-domain-name Default --os-user-domain-name Default \
         --os-project-name admin --os-username admin token issue
 
@@ -47,7 +47,7 @@ services.
 
    .. code-block:: console
 
-      $ openstack --os-auth-url https://controller:5000/v3 \
+      $ openstack --os-auth-url http://controller:5000/v3 \
         --os-project-domain-name Default --os-user-domain-name Default \
         --os-project-name myproject --os-username myuser token issue