From 4919ab11f3feda3a7272c5c85701f2b24d95ed7c Mon Sep 17 00:00:00 2001
From: Roger Luethi <rl@patchworkscience.org>
Date: Mon, 18 Aug 2014 11:47:50 +0200
Subject: [PATCH] labs: use example.com instead of domain.com

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

Change-Id: I86c4803bb705a11cf4099520036afce24ec47211
---
 labs/config/credentials                  | 3 +++
 labs/scripts/setup_cinder_controller.sh  | 2 +-
 labs/scripts/setup_glance.sh             | 2 +-
 labs/scripts/setup_keystone.sh           | 2 +-
 labs/scripts/setup_neutron_controller.sh | 2 +-
 labs/scripts/setup_nova_controller.sh    | 2 +-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/labs/config/credentials b/labs/config/credentials
index c4d4cde6..5ebc9dc8 100644
--- a/labs/config/credentials
+++ b/labs/config/credentials
@@ -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:
diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/setup_cinder_controller.sh
index 29769e1d..40effdce 100755
--- a/labs/scripts/setup_cinder_controller.sh
+++ b/labs/scripts/setup_cinder_controller.sh
@@ -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" \
diff --git a/labs/scripts/setup_glance.sh b/labs/scripts/setup_glance.sh
index 85f6d4d4..4a8f1ac6 100755
--- a/labs/scripts/setup_glance.sh
+++ b/labs/scripts/setup_glance.sh
@@ -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" \
diff --git a/labs/scripts/setup_keystone.sh b/labs/scripts/setup_keystone.sh
index 32efd6d4..4bbf7b6d 100755
--- a/labs/scripts/setup_keystone.sh
+++ b/labs/scripts/setup_keystone.sh
@@ -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"
diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh
index 530a19ae..2efb603f 100755
--- a/labs/scripts/setup_neutron_controller.sh
+++ b/labs/scripts/setup_neutron_controller.sh
@@ -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" \
diff --git a/labs/scripts/setup_nova_controller.sh b/labs/scripts/setup_nova_controller.sh
index f0977283..48a7e20d 100755
--- a/labs/scripts/setup_nova_controller.sh
+++ b/labs/scripts/setup_nova_controller.sh
@@ -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" \