labs: use example.com instead of domain.com

The canonical example domain is example.com (domain.com is in commercial
use).

Change-Id: I86c4803bb705a11cf4099520036afce24ec47211
This commit is contained in:
Roger Luethi 2014-08-18 11:47:50 +02:00
parent dcb47407a2
commit 4919ab11f3
6 changed files with 8 additions and 5 deletions

View File

@ -34,4 +34,7 @@
# Tenant and role for service accounts.
: ${SERVICE_TENANT_NAME:=service}
# Domain to use for email addresses (e.g. admin@example.com)
: ${MAIL_DOMAIN:=example.com}
# vim: set ai ts=4 sw=4 et ft=sh:

View File

@ -43,7 +43,7 @@ echo "Creating cinder user and giving it admin role under service tenant."
keystone user-create \
--name "$cinder_admin_user" \
--pass "$cinder_admin_password" \
--email cinder@domain.com
--email "cinder@$MAIL_DOMAIN"
keystone user-role-add \
--user "$cinder_admin_user" \

View File

@ -46,7 +46,7 @@ echo "Creating glance user and giving it admin role under service tenant."
keystone user-create \
--name "$glance_admin_user" \
--pass "$glance_admin_password" \
--email glance@domain.com
--email "glance@$MAIL_DOMAIN"
keystone user-role-add \
--user "$glance_admin_user" \

View File

@ -60,7 +60,7 @@ echo "Adding admin tenant."
keystone tenant-create --name "$ADMIN_TENANT_NAME" --description "Admin Tenant"
echo "Creating admin user."
keystone user-create --name "$ADMIN_USER_NAME" --pass "$ADMIN_PASSWORD" --email admin@domain.com
keystone user-create --name "$ADMIN_USER_NAME" --pass "$ADMIN_PASSWORD" --email "admin@$MAIL_DOMAIN"
echo "Creating admin roles."
keystone role-create --name "$ADMIN_ROLE_NAME"

View File

@ -42,7 +42,7 @@ echo "Creating neutron user and giving it admin role under service tenant."
keystone user-create \
--name "$neutron_admin_user" \
--pass "$neutron_admin_password" \
--email neutron@domain.com
--email "neutron@$MAIL_DOMAIN"
keystone user-role-add \
--user "$neutron_admin_user" \

View File

@ -44,7 +44,7 @@ echo "Creating nova user and giving it admin role under service tenant."
keystone user-create \
--name "$nova_admin_user" \
--pass "$nova_admin_password" \
--email nova@domain.com
--email "nova@$MAIL_DOMAIN"
keystone user-role-add \
--user "$nova_admin_user" \