opendev/system-config
Code Issues Proposed changes

Merge "Fix git repository refresh trigger issue of askbot"

Browse Source
This commit is contained in:
Jenkins 2015-10-15 13:22:43 +00:00 committed by Gerrit Code Review
commit ccf494ea4b
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
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'],
}

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

@ -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'],
}
}