openstack
/
adjutant
Code Issues Proposed changes

Better default email templates for openstack user tasks 

Change-Id: I3858dcaa99edb8cfe38b89638af89efb2a7f7774
This commit is contained in:
adriant 2016-02-10 13:29:05 +13:00
parent 854c6f6322
commit e61d518c20
11 changed files with 100 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
conf/conf.yaml
View File

@ -132,6 +132,16 @@ TASK_SETTINGS:
emails:
# To not send this email, set the value to null
initial: null
token:
subject: Invitation to an OpenStack Project
reply: no-reply@example.com
template: invite_user_token.txt
html_template: invite_user_token.txt
completed:
subject: Invitation Completed
reply: no-reply@example.com
template: invite_user_completed.txt
html_template: invite_user_completed.txt
errors:
SMTPException:
notification: acknowledge
@ -143,8 +153,13 @@ TASK_SETTINGS:
token:
subject: Password Reset for OpenStack
reply: no-reply@example.com
template: password_reset.txt
html_template: password_reset.txt
template: password_reset_token.txt
html_template: password_reset_token.txt
completed:
subject: Password Reset Completed
reply: no-reply@example.com
template: password_reset_completed.txt
html_template: password_reset_completed.txt
errors:
SMTPException:
notification: acknowledge
@ -156,8 +171,13 @@ TASK_SETTINGS:
token:
subject: Setup Your OpenStack Password
reply: no-reply@example.com
template: initial_password.txt
html_template: initial_password.txt
template: initial_password_token.txt
html_template: initial_password_token.txt
completed:
subject: New User Setup Completed
reply: no-reply@example.com
template: initial_password_completed.txt
html_template: initial_password_completed.txt
errors:
SMTPException:
notification: acknowledge

2
stacktask/api/v1/templates/initial.txt
View File

@ -2,7 +2,7 @@ Hello,
Your task is in our system and now waiting approval.
The actions you had requested are:
The actions you have requested are:
{% for action in actions %}
- {{ action }}
{% endfor %}

5
stacktask/api/v1/templates/initial_password_completed.txt Normal file
View File

@ -0,0 +1,5 @@
Hello,
You have successfully setup your new OpenStack user and should be able to access the dashboard and APIs.
Thank you for using our service.

2
stacktask/api/v1/templates/initial_password.txt → stacktask/api/v1/templates/initial_password_token.txt
View File

@ -4,3 +4,5 @@ You can setup your initial OpenStack user password by following this link:
{{ tokenurl }}{{ token }}/
Once setup you will have access to the web dashboard.
Thank you for using our service.

7
stacktask/api/v1/templates/invite_user_completed.txt Normal file
View File

@ -0,0 +1,7 @@
Hello,
You have successfully completed your OpenStack project invitation.
You should now have access to your new project via the dashboard and APIs.
Thank you for using our service.

12
stacktask/api/v1/templates/invite_user_token.txt Normal file
View File

@ -0,0 +1,12 @@
Hello,
Someone has invited you to join their OpenStack project.
To complete this invitation just follow this link:
{{ tokenurl }}{{ token }}/
If you are a new user you will just have to setup your password for a user with this email address, but if you already have a user, you simply have to confirm your invitation.
This link will expire in 24 hours at which point you will need to request another one from the person who invited you.
Thank you for using our service.

7
stacktask/api/v1/templates/password_reset.txt
View File

@ -1,7 +0,0 @@
Hello,
Your password reset link is:
{{ tokenurl }}{{ token }}/
If you did not request this reset ignore this email.

7
stacktask/api/v1/templates/password_reset_completed.txt Normal file
View File

@ -0,0 +1,7 @@
Hello,
You have successfully reset your OpenStack user password.
If you did not request this reset get in touch with your infrastructure admins.
Thank you for using our service.

10
stacktask/api/v1/templates/password_reset_token.txt Normal file
View File

@ -0,0 +1,10 @@
Hello,
To reset your OpenStack user password follow this link:
{{ tokenurl }}{{ token }}/
This link will expire in 24 hours at which point you will need to request another one.
If you did not request this reset, either ignore this email and allow it to expire, or get in touch with your infrastructure admins if you are worried.
Thank you for using our service.

6
stacktask/api/v1/templates/token.txt
View File

@ -1,13 +1,13 @@
Hello,
Your registration with our service is almost done.
Your task with StackTask is almost complete.
The action you have requested is:
The actions in your task are:
{% for action in actions %}
- {{ action }}
{% endfor %}
Your token to complete this action is:
Your token to complete these actions is:
{{ tokenurl }}{{ token }}/

34
stacktask/test_settings.py
View File

@ -98,7 +98,19 @@ DEFAULT_TASK_SETTINGS = {
TASK_SETTINGS = {
'invite_user': {
'emails': {
'initial': None
'initial': None,
'token': {
'reply': 'no-reply@example.com',
'html_template': 'invite_user_token.txt',
'template': 'invite_user_token.txt',
'subject': 'invite_user'
},
'completed': {
'reply': 'no-reply@example.com',
'html_template': 'invite_user_completed.txt',
'template': 'invite_user_completed.txt',
'subject': 'invite_user'
}
}
},
'create_project': {
@ -112,8 +124,14 @@ TASK_SETTINGS = {
'emails': {
'token': {
'reply': 'no-reply@example.com',
'html_template': 'password_reset.txt',
'template': 'password_reset.txt',
'html_template': 'password_reset_token.txt',
'template': 'password_reset_token.txt',
'subject': 'Password Reset for OpenStack'
},
'completed': {
'reply': 'no-reply@example.com',
'html_template': 'password_reset_completed.txt',
'template': 'password_reset_completed.txt',
'subject': 'Password Reset for OpenStack'
}
}
@ -123,8 +141,14 @@ TASK_SETTINGS = {
'emails': {
'token': {
'reply': 'no-reply@example.com',
'html_template': 'initial_password.txt',
'template': 'initial_password.txt',
'html_template': 'initial_password_token.txt',
'template': 'initial_password_token.txt',
'subject': 'Setup Your OpenStack Password'
},
'completed': {
'reply': 'no-reply@example.com',
'html_template': 'initial_password_completed.txt',
'template': 'initial_password_completed.txt',
'subject': 'Setup Your OpenStack Password'
}
}