From 90238518e1f7d1622069212465c3077e81185c62 Mon Sep 17 00:00:00 2001
From: Alexey Khivin <akhivin@mirantis.com>
Date: Thu, 24 Sep 2015 20:35:59 +0300
Subject: [PATCH] Default recovery password removed for ActiveDirectory app

Recovery password were not initialized properly and default value
was always used

Change-Id: I63b5545642e10727b7d29670e24a717d385eede6
Closes-bug: #1499456
---
 Windows/ActiveDirectory/package/Classes/Controller.yaml | 1 -
 Windows/ActiveDirectory/package/UI/ui.yaml              | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Windows/ActiveDirectory/package/Classes/Controller.yaml b/Windows/ActiveDirectory/package/Classes/Controller.yaml
index f787b97d..c8d91fed 100644
--- a/Windows/ActiveDirectory/package/Classes/Controller.yaml
+++ b/Windows/ActiveDirectory/package/Classes/Controller.yaml
@@ -21,7 +21,6 @@ Properties:
 
   recoveryPassword:
     Contract: $.string().notNull()
-    Default: P@ssw0rd
 
 Methods:
   deploy:
diff --git a/Windows/ActiveDirectory/package/UI/ui.yaml b/Windows/ActiveDirectory/package/UI/ui.yaml
index 5147747d..c5c72051 100644
--- a/Windows/ActiveDirectory/package/UI/ui.yaml
+++ b/Windows/ActiveDirectory/package/UI/ui.yaml
@@ -4,6 +4,7 @@ Templates:
   primaryController:
     ?:
       type: io.murano.apps.activeDirectory.PrimaryController
+    recoveryPassword: $.appConfiguration.recoveryPassword
     host:
       ?:
         type: io.murano.apps.activeDirectory.Host
@@ -22,6 +23,7 @@ Templates:
   secondaryController:
     ?:
       type: io.murano.apps.activeDirectory.SecondaryController
+    recoveryPassword: $.appConfiguration.recoveryPassword
     host:
       ?:
         type: io.murano.apps.activeDirectory.Host