Merge "Add puppet-elasticsearch as split out module"

This commit is contained in:
Jenkins 2014-12-15 21:43:08 +00:00 committed by Gerrit Code Review
commit c36cdf95a6
4 changed files with 23 additions and 0 deletions

View File

@ -216,6 +216,13 @@
acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
groups:
- openstack-ci
- project: openstack-infra/puppet-elasticsearch
use-storyboard: true
upstream: git://github.com/mmedvede/puppet-elasticsearch.git
acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
description: Puppet module for elasticsearch
groups:
- openstack-ci
- project: openstack-infra/puppet-github
use-storyboard: true
upstream: git://github.com/nibalizer/openstackci-github

View File

@ -34,6 +34,7 @@ openstack-infra:
- openstack-infra/publications
- openstack-infra/puppet-apparmor
- openstack-infra/puppet-dashboard
- openstack-infra/puppet-elasticsearch
- openstack-infra/puppet-github
- openstack-infra/puppet-httpd
- openstack-infra/puppet-jenkins
@ -819,6 +820,7 @@ openstack-merges:
- openstack-infra/publications
- openstack-infra/puppet-apparmor
- openstack-infra/puppet-dashboard
- openstack-infra/puppet-elasticsearch
- openstack-infra/puppet-github
- openstack-infra/puppet-httpd
- openstack-infra/puppet-jenkins

View File

@ -2037,6 +2037,14 @@
- gate-{name}-pep8
- gate-{name}-bashate
- project:
name: puppet-elasticsearch
node: 'bare-precise || bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- project:
name: puppet-github
node: 'bare-precise || bare-trusty'

View File

@ -3344,6 +3344,12 @@ projects:
- name: merge-check
- name: noop-jobs
- name: openstack-infra/puppet-elasticsearch
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-github
template:
- name: merge-check