From 0bb1758d610b71fbd2e949de101857b4ad00aa20 Mon Sep 17 00:00:00 2001
From: Sergey Kraynev <skraynev@mirantis.com>
Date: Wed, 27 Jul 2016 18:07:02 +0300
Subject: [PATCH] Fix Jenkins Job Builder installation

Currently Jenkins App install JJB from master and it cause to
Authorization error, because JJB from master does not read config file.
This patch binds version of JJB to 1.6.1 (last released)

There is related bug in:
JJB https://storyboard.openstack.org/#!/story/2000686

Change-Id: Ib68ac864ab4d581cf59b6f909198b9699605f45f
---
 .../Jenkins/package/Resources/scripts/install_jjb.pp      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/murano-apps/Jenkins/package/Resources/scripts/install_jjb.pp b/murano-apps/Jenkins/package/Resources/scripts/install_jjb.pp
index ee5904b..15f3c5b 100644
--- a/murano-apps/Jenkins/package/Resources/scripts/install_jjb.pp
+++ b/murano-apps/Jenkins/package/Resources/scripts/install_jjb.pp
@@ -10,12 +10,16 @@ node default {
       base                           => '',
     }
   }
+  service { 'jenkins':
+    ensure => running,
+    enable => true,
+  }
   class { '::jenkins::job_builder':
     url                         => 'http://localhost:8080',
     username                    => $username,
     password                    => $password,
     jenkins_jobs_update_timeout => 1200,
-    git_revision                => 'master',
+    git_revision                => '1.6.1',
     git_url                     => 'https://git.openstack.org/openstack-infra/jenkins-job-builder',
     config_dir                  => $::project_config::jenkins_job_builder_config_dir,
     require                     => $::project_config::config_dir,
@@ -30,4 +34,4 @@ node default {
     hour    => '*',
     minute  => '*/5',
   }
-}
\ No newline at end of file
+}