openstack/adjutant
Code Issues Proposed changes

conf cleanup to better make use of default task settings

Browse Source 
* just removing reply fields as redundant and needlessly duplicated

Change-Id: Ia97ce11a9ebc9f10f06bbf4a10468394cabf4c18
This commit is contained in:
adriant 2016-02-10 15:26:28 +13:00
parent 47ce304173
commit f25ceeb5d2
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf/conf.yaml
View File

@ -135,12 +135,10 @@ TASK_SETTINGS:
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:
@ -153,12 +151,10 @@ TASK_SETTINGS:
initial: null
token:
subject: Password Reset for OpenStack
reply: no-reply@example.com
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:
@ -171,12 +167,10 @@ TASK_SETTINGS:
initial: null
token:
subject: Setup Your OpenStack Password
reply: no-reply@example.com
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:

6
stacktask/test_settings.py
View File

@ -101,13 +101,11 @@ TASK_SETTINGS = {
'emails': {
'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'
@ -124,13 +122,11 @@ TASK_SETTINGS = {
'handle_duplicates': 'cancel',
'emails': {
'token': {
'reply': 'no-reply@example.com',
'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'
@ -141,13 +137,11 @@ TASK_SETTINGS = {
'handle_duplicates': 'cancel',
'emails': {
'token': {
'reply': 'no-reply@example.com',
'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'