Merge "Switch off creating a keystone admin endpoint by default"
diff --git a/lib/keystone b/lib/keystone
index f8b5ccb..0609abd 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -123,7 +123,7 @@
 KEYSTONE_ENABLE_CACHE=${KEYSTONE_ENABLE_CACHE:-True}
 
 # Whether to create a keystone admin endpoint for legacy applications
-KEYSTONE_ADMIN_ENDPOINT=$(trueorfalse True KEYSTONE_ADMIN_ENDPOINT)
+KEYSTONE_ADMIN_ENDPOINT=$(trueorfalse False KEYSTONE_ADMIN_ENDPOINT)
 
 # Functions
 # ---------