don't use secrete as admin password - fixes #34
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index cfb4572..f48eaf9 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -6,8 +6,8 @@
$BIN_DIR/keystone-manage $* tenant add invisible_to_admin
# Users
-$BIN_DIR/keystone-manage $* user add admin secrete
-$BIN_DIR/keystone-manage $* user add demo secrete
+$BIN_DIR/keystone-manage $* user add admin %ADMIN_PASSWORD%
+$BIN_DIR/keystone-manage $* user add demo %ADMIN_PASSWORD%
# Roles
$BIN_DIR/keystone-manage $* role add Admin
@@ -36,6 +36,8 @@
# Tokens
$BIN_DIR/keystone-manage $* token add %SERVICE_TOKEN% admin admin 2015-02-05T00:00
-# EC2 related creds
-$BIN_DIR/keystone-manage $* credentials add admin EC2 'admin:admin' admin admin || echo "no support for adding credentials"
-$BIN_DIR/keystone-manage $* credentials add demo EC2 'demo:demo' demo demo || echo "no support for adding credentials"
+# EC2 related creds - note we are setting the token to user_password
+# but keystone doesn't parse them - it is just a blob from keystone's
+# point of view
+$BIN_DIR/keystone-manage $* credentials add admin EC2 'admin_%ADMIN_PASSWORD%' admin admin || echo "no support for adding credentials"
+$BIN_DIR/keystone-manage $* credentials add demo EC2 'demo_%ADMIN_PASSWORD%' demo demo || echo "no support for adding credentials"