From 0149a656ca68ec17386465cfca7bc485a368e0bd Mon Sep 17 00:00:00 2001
From: Sergey Kraynev <skraynev@mirantis.com>
Date: Tue, 10 May 2016 17:49:56 +0300
Subject: [PATCH] [Jenkins] Set User, Mail for Jenkins in meta App

Previously we had default values in Jenkins Application directly, but
these defaults are used only for demo and testing. Current patch remove
these default values and move them to meta CICD Application.

Currently it's the same emal and user as used for authorization in
Jenkins and Gerrit. In the future it may be separate user/mail for
independent work Jenkins with Gerrit.

Change-Id: Id13c407225f4fbe766567207a40fb606bb04a085
---
 .../package/Classes/CiCdEnvironment.yaml        |  5 ++++-
 .../Jenkins/package/Classes/Jenkins.yaml        | 17 ++---------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
index 1c1bd8d..41729bd 100644
--- a/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
+++ b/murano-apps/CiCdEnvironment/package/Classes/CiCdEnvironment.yaml
@@ -88,6 +88,7 @@ Methods:
               ldap => $this.ldap)
 
       # Jenkins
+      # set user and mail for accessing to Gerrit from Jenkins
       - If: $this.jenkins = null
         Then:
           - $._environment.reporter.report($this,
@@ -105,7 +106,9 @@ Methods:
               name => 'Jenkins',
               instance => $jenkinsInstance,
               ldap => $this.ldap,
-              cfplugin => false)
+              cfplugin => false,
+              gitUser => $user,
+              gitEmail => $mail)
 
       # Deploy all
       - Parallel:
diff --git a/murano-apps/Jenkins/package/Classes/Jenkins.yaml b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
index 570886b..f7d7d01 100644
--- a/murano-apps/Jenkins/package/Classes/Jenkins.yaml
+++ b/murano-apps/Jenkins/package/Classes/Jenkins.yaml
@@ -137,21 +137,8 @@ Methods:
       - gitEmail:
           Contract: $.string()
     Body:
-      # Set defaults if not provided.
-      - If: $gitUser in ['', null]
-        Then:
-          - $gitUsername: 'user'
-        Else:
-          - $gitUsername: $gitUser
-
-      - If: $gitEmail in ['', null]
-        Then:
-          - $gitUserEmail: 'user@mirantis.test'
-        Else:
-          - $gitUserEmail: $gitEmail
-
-      - $.instance.setHieraValue('git_user', $gitUsername)
-      - $.instance.setHieraValue('git_user_email', $gitUserEmail)
+      - $.instance.setHieraValue('git_user', $gitUser)
+      - $.instance.setHieraValue('git_user_email', $gitEmail)
       - $resources: new(sys:Resources)
       - $._environment.reporter.report($this, 'Configure Jenkins Git plugin...')
       - $template: $resources.yaml('ConfigureGit.template')