From ca8bf103c4e9212a1db8b71929bf52c4da1ce31c Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Mon, 5 Oct 2015 16:18:29 +0100
Subject: [PATCH] Fix git repository refresh trigger issue of askbot

ask.o.o suffers from a refresh trigger issue due to a vcsrepo bug.
This patchset is replacing the git resource management by
puppet community's puppet-git_resource that supports proper commit
ref handling after approval of the following pull requests on
upstream:
https://github.com/puppet-community/puppet-git_resource/pull/18
https://github.com/puppet-community/puppet-git_resource/pull/17

Depends-On: I36a2664707f900fe7807d5f05f69423682c3a51a
Change-Id: I2ef2e7644ec7191393559a655a4c61112e6f1566
---
 modules/openstack_project/manifests/ask.pp    | 19 ++++++++++---------
 .../manifests/ask_staging.pp                  | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/modules/openstack_project/manifests/ask.pp b/modules/openstack_project/manifests/ask.pp
index a18e4bad6c..44b12a7ff5 100644
--- a/modules/openstack_project/manifests/ask.pp
+++ b/modules/openstack_project/manifests/ask.pp
@@ -117,16 +117,17 @@ class openstack_project::ask (
   }
 
   # askbot-theme openstack theme
-  vcsrepo { '/srv/askbot-site/themes':
-    ensure   => latest,
-    provider => git,
-    revision => 'master',
-    source   => 'https://git.openstack.org/openstack-infra/askbot-theme',
-    require  => [
+  git { 'askbot-theme':
+    ensure  => present,
+    path    => '/srv/askbot-site/themes',
+    branch  => 'master',
+    origin  => 'https://git.openstack.org/openstack-infra/askbot-theme',
+    latest  => true,
+    require => [
       File['/srv/askbot-site'], Package['git']
     ],
-    before   => Exec['askbot-syncdb'],
-    notify   => [
+    before  => Exec['askbot-syncdb'],
+    notify  => [
       Exec['theme-bundle-install-os'],
       Exec['theme-bundle-compile-os'],
       Exec['askbot-static-generate'],
@@ -134,7 +135,7 @@ class openstack_project::ask (
   }
 
   askbot::theme::compass { 'os':
-    require => Vcsrepo['/srv/askbot-site/themes'],
+    require => Git['askbot-theme'],
     before  => Exec['askbot-static-generate'],
   }
 
diff --git a/modules/openstack_project/manifests/ask_staging.pp b/modules/openstack_project/manifests/ask_staging.pp
index 79e53136c3..4d6e7cf87c 100644
--- a/modules/openstack_project/manifests/ask_staging.pp
+++ b/modules/openstack_project/manifests/ask_staging.pp
@@ -113,16 +113,17 @@ class openstack_project::ask_staging (
   }
 
   # askbot-theme openstack theme
-  vcsrepo { '/srv/askbot-site/themes':
-    ensure   => latest,
-    provider => git,
-    revision => 'feature/development',
-    source   => 'https://git.openstack.org/openstack-infra/askbot-theme',
-    require  => [
+  git { 'askbot-theme':
+    ensure  => present,
+    path    => '/srv/askbot-site/themes',
+    branch  => 'feature/development',
+    origin  => 'https://git.openstack.org/openstack-infra/askbot-theme',
+    latest  => true,
+    require => [
       File['/srv/askbot-site'], Package['git']
     ],
-    before   => Exec['askbot-syncdb'],
-    notify   => [
+    before  => Exec['askbot-syncdb'],
+    notify  => [
       Exec['theme-bundle-install-os'],
       Exec['theme-bundle-compile-os'],
       Exec['askbot-static-generate'],
@@ -130,7 +131,7 @@ class openstack_project::ask_staging (
   }
 
   askbot::theme::compass { 'os':
-    require => Vcsrepo['/srv/askbot-site/themes'],
+    require => Git['askbot-theme'],
     before  => Exec['askbot-static-generate'],
   }
 }