Merge "Accept env variables to override default passwords"

openstack · May 17, 2013 · 7b99bd6 · 7b99bd6
2 parents ab16136 + 76ee689
commit 7b99bd6
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/tools/sample_data.sh b/tools/sample_data.sh
@@ -37,6 +37,17 @@
 # service              ec2       admin
 # service              swift     admin
 
+# By default, passwords used are those in the OpenStack Install and Deploy Manual.
+# One can override these (publicly known, and hence, insecure) passwords by setting the appropriate
+# environment variables. A common default password for all the services can be used by
+# setting the "SERVICE_PASSWORD" environment variable.
+
+ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}
+NOVA_PASSWORD=${NOVA_PASSWORD:-${SERVICE_PASSWORD:-nova}}
+GLANCE_PASSWORD=${GLANCE_PASSWORD:-${SERVICE_PASSWORD:-glance}}
+EC2_PASSWORD=${EC2_PASSWORD:-${SERVICE_PASSWORD:-ec2}}
+SWIFT_PASSWORD=${SWIFT_PASSWORD:-${SERVICE_PASSWORD:-swiftpass}}
+
 CONTROLLER_PUBLIC_ADDRESS=${CONTROLLER_PUBLIC_ADDRESS:-localhost}
 CONTROLLER_ADMIN_ADDRESS=${CONTROLLER_ADMIN_ADDRESS:-localhost}
 CONTROLLER_INTERNAL_ADDRESS=${CONTROLLER_INTERNAL_ADDRESS:-localhost}
@@ -80,7 +91,7 @@ DEMO_TENANT=$(get_id keystone tenant-create --name=demo \
                                             --description "Default Tenant")
 
 ADMIN_USER=$(get_id keystone user-create --name=admin \
-                                         --pass=secrete)
+                                         --pass="${ADMIN_PASSWORD}")
 
 ADMIN_ROLE=$(get_id keystone role-create --name=admin)
 
@@ -95,30 +106,30 @@ SERVICE_TENANT=$(get_id keystone tenant-create --name=service \
                                                --description "Service Tenant")
 
 GLANCE_USER=$(get_id keystone user-create --name=glance \
-                                          --pass=glance)
+                                          --pass="${GLANCE_PASSWORD}")
 
 keystone user-role-add --user-id $GLANCE_USER \
                        --role-id $ADMIN_ROLE \
                        --tenant-id $SERVICE_TENANT
 
 NOVA_USER=$(get_id keystone user-create --name=nova \
-                                        --pass=nova \
+                                        --pass="${NOVA_PASSWORD}" \
                                         --tenant-id $SERVICE_TENANT)
 
 keystone user-role-add --user-id $NOVA_USER \
                        --role-id $ADMIN_ROLE \
                        --tenant-id $SERVICE_TENANT
 
 EC2_USER=$(get_id keystone user-create --name=ec2 \
-                                       --pass=ec2 \
+                                       --pass="${EC2_PASSWORD}" \
                                        --tenant-id $SERVICE_TENANT)
 
 keystone user-role-add --user-id $EC2_USER \
                        --role-id $ADMIN_ROLE \
                        --tenant-id $SERVICE_TENANT
 
 SWIFT_USER=$(get_id keystone user-create --name=swift \
-                                         --pass=swiftpass \
+                                         --pass="${SWIFT_PASSWORD}" \
                                          --tenant-id $SERVICE_TENANT)
 
 keystone user-role-add --user-id $SWIFT_USER \