Merge remote-tracking branch 'origin/master' into openrc
Conflicts:
exercise.sh
diff --git a/openrc b/openrc
index 09e0ca5..e45b8fd 100644
--- a/openrc
+++ b/openrc
@@ -20,11 +20,11 @@
# With Keystone you pass the keystone password instead of an api key.
export NOVA_API_KEY=${ADMIN_PASSWORD:-secrete}
-# With the addition of Keystone, to use an openstack cloud you should
-# authenticate against keystone, which returns a **Token** and **Service
-# Catalog**. The catalog contains the endpoint for all services the user/tenant
-# has access to - including nova, glance, keystone, swift, ... We currently
-# recommend using the 2.0 *auth api*.
+# With the addition of Keystone, to use an openstack cloud you should
+# authenticate against keystone, which returns a **Token** and **Service
+# Catalog**. The catalog contains the endpoint for all services the user/tenant
+# has access to - including nova, glance, keystone, swift, ... We currently
+# recommend using the 2.0 *auth api*.
#
# *NOTE*: Using the 2.0 *auth api* does mean that compute api is 2.0. We will
# use the 1.1 *compute api*