Merge "Add puppet-infracloud module to openstack-infra"

This commit is contained in:
Jenkins 2015-09-25 21:11:01 +00:00 committed by Gerrit Code Review
commit b111f1de7b
5 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,13 @@
[access "refs/heads/*"]
abandon = group puppet-infracloud-core
label-Code-Review = -2..+2 group puppet-infracloud-core
label-Workflow = -1..+1 group puppet-infracloud-core
[access "refs/tags/*"]
pushSignedTag = group puppet-infracloud-release
[receive]
requireChangeId = true
[submit]
mergeContent = true

View File

@ -382,6 +382,11 @@
description: Cookiecutter template for compliant OpenStack-infra puppet-modules description: Cookiecutter template for compliant OpenStack-infra puppet-modules
groups: groups:
- openstack-ci - openstack-ci
- project: openstack-infra/puppet-infracloud
use-storyboard: true
description: Puppet module for deploying the Infra Cloud
groups:
- openstack-ci
- project: openstack-infra/puppet-iptables - project: openstack-infra/puppet-iptables
use-storyboard: true use-storyboard: true
description: Puppet module for iptables description: Puppet module for iptables

View File

@ -643,6 +643,7 @@ openstack-infra:
- openstack-infra/puppet-hound - openstack-infra/puppet-hound
- openstack-infra/puppet-httpd - openstack-infra/puppet-httpd
- openstack-infra/puppet-infra-cookiecutter - openstack-infra/puppet-infra-cookiecutter
- openstack-infra/puppet-infracloud
- openstack-infra/puppet-iptables - openstack-infra/puppet-iptables
- openstack-infra/puppet-jeepyb - openstack-infra/puppet-jeepyb
- openstack-infra/puppet-jenkins - openstack-infra/puppet-jenkins
@ -949,6 +950,7 @@ openstack-merges:
- openstack-infra/puppet-haveged - openstack-infra/puppet-haveged
- openstack-infra/puppet-hound - openstack-infra/puppet-hound
- openstack-infra/puppet-httpd - openstack-infra/puppet-httpd
- openstack-infra/puppet-infracloud
- openstack-infra/puppet-iptables - openstack-infra/puppet-iptables
- openstack-infra/puppet-jeepyb - openstack-infra/puppet-jeepyb
- openstack-infra/puppet-jenkins - openstack-infra/puppet-jenkins

View File

@ -4180,6 +4180,17 @@
branch-designator: '-nv' branch-designator: '-nv'
branch-override: default branch-override: default
- project:
name: puppet-infracloud
node: 'bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- puppet-beaker-jobs:
branch-designator: '-nv'
branch-override: default
- project: - project:
name: puppet-iptables name: puppet-iptables
node: 'bare-trusty' node: 'bare-trusty'

View File

@ -6240,6 +6240,13 @@ projects:
- name: merge-check - name: merge-check
- name: noop-jobs - name: noop-jobs
- name: openstack-infra/puppet-infracloud
template:
- name: merge-check
- name: infra-puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: puppet-beaker-jobs-nv
- name: openstack-infra/puppet-iptables - name: openstack-infra/puppet-iptables
template: template:
- name: merge-check - name: merge-check