Merge "Split out lodgeit module"

This commit is contained in:
Jenkins 2015-01-05 17:01:59 +00:00 committed by Gerrit Code Review
commit e7d1d28dd4
4 changed files with 23 additions and 0 deletions

View File

@ -254,6 +254,13 @@
description: Puppet module to add kibana functionality
groups:
- openstack-ci
- project: openstack-infra/puppet-lodgeit
use-storyboard: true
upstream: git://github.com/jesusaurus/puppet-lodgeit.git
acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
description: Puppet module to manage LodgeIt
groups:
- openstack-ci
- project: openstack-infra/puppet-pip
use-storyboard: true
upstream: git://github.com/nibalizer/puppet-module-openstack-pip.git

View File

@ -39,6 +39,7 @@ openstack-infra:
- openstack-infra/puppet-httpd
- openstack-infra/puppet-jenkins
- openstack-infra/puppet-kibana
- openstack-infra/puppet-lodgeit
- openstack-infra/puppet-pip
- openstack-infra/puppet-storyboard
- openstack-infra/puppet-vcsrepo
@ -833,6 +834,7 @@ openstack-merges:
- openstack-infra/puppet-httpd
- openstack-infra/puppet-jenkins
- openstack-infra/puppet-kibana
- openstack-infra/puppet-lodgeit
- openstack-infra/puppet-pip
- openstack-infra/puppet-storyboard
- openstack-infra/puppet-vcsrepo

View File

@ -2077,6 +2077,14 @@
jobs:
- puppet-check-jobs
- project:
name: puppet-lodgeit
node: 'bare-precise || bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- project:
name: puppet-pip
node: 'bare-precise || bare-trusty'

View File

@ -3384,6 +3384,12 @@ projects:
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-lodgeit
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-pip
template:
- name: merge-check