opendev/system-config
Code Issues Proposed changes

Fix git repository refresh trigger issue of askbot

Browse Source 
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
This commit is contained in:
Marton Kiss 2015-10-05 16:18:29 +01:00
parent baddd31120
commit ca8bf103c4
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/openstack_project/manifests/ask.pp
View File

@ -117,16 +117,17 @@ class openstack_project::ask (
} }
# askbot-theme openstack theme # askbot-theme openstack theme
vcsrepo { '/srv/askbot-site/themes': git { 'askbot-theme':
ensure => latest, ensure => present,
provider => git, path => '/srv/askbot-site/themes',
revision => 'master', branch => 'master',
source => 'https://git.openstack.org/openstack-infra/askbot-theme', origin => 'https://git.openstack.org/openstack-infra/askbot-theme',
require => [ latest => true,
require => [
File['/srv/askbot-site'], Package['git'] File['/srv/askbot-site'], Package['git']
], ],
before => Exec['askbot-syncdb'], before => Exec['askbot-syncdb'],
notify => [ notify => [
Exec['theme-bundle-install-os'], Exec['theme-bundle-install-os'],
Exec['theme-bundle-compile-os'], Exec['theme-bundle-compile-os'],
Exec['askbot-static-generate'], Exec['askbot-static-generate'],
@ -134,7 +135,7 @@ class openstack_project::ask (
} }
askbot::theme::compass { 'os': askbot::theme::compass { 'os':
require => Vcsrepo['/srv/askbot-site/themes'], require => Git['askbot-theme'],
before => Exec['askbot-static-generate'], before => Exec['askbot-static-generate'],
} }

19
modules/openstack_project/manifests/ask_staging.pp
View File

@ -113,16 +113,17 @@ class openstack_project::ask_staging (
} }
# askbot-theme openstack theme # askbot-theme openstack theme
vcsrepo { '/srv/askbot-site/themes': git { 'askbot-theme':
ensure => latest, ensure => present,
provider => git, path => '/srv/askbot-site/themes',
revision => 'feature/development', branch => 'feature/development',
source => 'https://git.openstack.org/openstack-infra/askbot-theme', origin => 'https://git.openstack.org/openstack-infra/askbot-theme',
require => [ latest => true,
require => [
File['/srv/askbot-site'], Package['git'] File['/srv/askbot-site'], Package['git']
], ],
before => Exec['askbot-syncdb'], before => Exec['askbot-syncdb'],
notify => [ notify => [
Exec['theme-bundle-install-os'], Exec['theme-bundle-install-os'],
Exec['theme-bundle-compile-os'], Exec['theme-bundle-compile-os'],
Exec['askbot-static-generate'], Exec['askbot-static-generate'],
@ -130,7 +131,7 @@ class openstack_project::ask_staging (
} }
askbot::theme::compass { 'os': askbot::theme::compass { 'os':
require => Vcsrepo['/srv/askbot-site/themes'], require => Git['askbot-theme'],
before => Exec['askbot-static-generate'], before => Exec['askbot-static-generate'],
} }
} }