@@ -119,9 +119,9 @@ ALT_TENANT_NAME=$OS_TENANT_NAME

 FLAVOR_REF=1

 FLAVOR_REF_ALT=2

-ADMIN_USERNAME={$ADMIN_USERNAME:-admin}

-ADMIN_PASSWORD={$ADMIN_PASSWORD:-secrete}

-ADMIN_TENANT_NAME={$ADMIN_TENANT:-admin}

+ADMIN_USERNAME=${ADMIN_USERNAME:-admin}

+ADMIN_PASSWORD=${ADMIN_PASSWORD:-secrete}

+ADMIN_TENANT_NAME=${ADMIN_TENANT:-admin}

 # Do any of the following need to be configurable?

 COMPUTE_CATALOG_TYPE=compute