From dba11b87d1799a6bd8a257db4765a4600e14b683 Mon Sep 17 00:00:00 2001
From: adrian-turjak <adriant@catalyst.net.nz>
Date: Thu, 25 May 2017 16:57:36 +1200
Subject: [PATCH] Slightly saner default duplicate policies

* In most cases other than signup cancelling a duplicate
  is fairly safe, and better UX.

Change-Id: I5c154b649513d84b92821bdd60efa8fdab070dea
---
 conf/conf.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/conf/conf.yaml b/conf/conf.yaml
index 676d7cc..aa9dbb3 100644
--- a/conf/conf.yaml
+++ b/conf/conf.yaml
@@ -258,6 +258,7 @@ TASK_SETTINGS:
         # If domain isn't set explicity, will service user domain (see KEYSTONE).
         default_parent_id: null
     invite_user:
+        duplicate_policy: cancel
         emails:
             # To not send this email, set the value to null
             initial: null
@@ -292,11 +293,17 @@ TASK_SETTINGS:
                 subject: Welcome to OpenStack!
                 template: initial_password_completed.txt
     edit_user:
+        duplicate_policy: cancel
         emails:
             initial: null
             token: null
         role_blacklist:
             - admin
+    edit_roles:
+        duplicate_policy: cancel
+        emails:
+            initial: null
+            token: null
     update_email:
         duplicate_policy: cancel
         additional_actions: