Merge "Add puppet-simpleproxy as split out module"

This commit is contained in:
Jenkins 2015-01-29 18:40:49 +00:00 committed by Gerrit Code Review
commit 215914c4db
4 changed files with 23 additions and 16 deletions

View File

@ -505,6 +505,13 @@
description: Puppet module to manage reviewday
groups:
- openstack-ci
- project: openstack-infra/puppet-simpleproxy
use-storyboard: true
upstream: git://github.com/Triniplex/puppet-mysql_proxy.git
acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
description: Puppet module for simpleproxy
groups:
- openstack-ci
- project: openstack-infra/puppet-snmpd
use-storyboard: true
upstream: git://github.com/Triniplex/puppet-snmpd

View File

@ -64,7 +64,6 @@ openstack-infra:
- openstack-infra/puppet-mediawiki
- openstack-infra/puppet-meetbot
- openstack-infra/puppet-mysql_backup
- openstack-infra/puppet-mysql_proxy
- openstack-infra/puppet-nodepool
- openstack-infra/puppet-openafs
- openstack-infra/puppet-openstackid
@ -77,6 +76,7 @@ openstack-infra:
- openstack-infra/puppet-redis
- openstack-infra/puppet-releasestatus
- openstack-infra/puppet-reviewday
- openstack-infra/puppet-simpleproxy
- openstack-infra/puppet-snmpd
- openstack-infra/puppet-ssh
- openstack-infra/puppet-ssl_cert_check
@ -921,7 +921,6 @@ openstack-merges:
- openstack-infra/puppet-mediawiki
- openstack-infra/puppet-meetbot
- openstack-infra/puppet-mysql_backup
- openstack-infra/puppet-mysql_proxy
- openstack-infra/puppet-nodepool
- openstack-infra/puppet-openafs
- openstack-infra/puppet-openstackid
@ -934,6 +933,7 @@ openstack-merges:
- openstack-infra/puppet-redis
- openstack-infra/puppet-releasestatus
- openstack-infra/puppet-reviewday
- openstack-infra/puppet-simpleproxy
- openstack-infra/puppet-snmpd
- openstack-infra/puppet-ssh
- openstack-infra/puppet-ssl_cert_check

View File

@ -2344,14 +2344,6 @@
jobs:
- puppet-check-jobs
- project:
name: puppet-mysql_proxy
node: 'bare-precise || bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- project:
name: puppet-nodepool
node: 'bare-precise || bare-trusty'
@ -2440,6 +2432,14 @@
jobs:
- puppet-check-jobs
- project:
name: puppet-simpleproxy
node: 'bare-precise || bare-trusty'
tarball-site: tarballs.openstack.org
jobs:
- puppet-check-jobs
- project:
name: puppet-snmpd
node: 'bare-precise || bare-trusty'

View File

@ -3581,12 +3581,6 @@ projects:
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-mysql_proxy
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-nodepool
template:
- name: merge-check
@ -3653,6 +3647,12 @@ projects:
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-simpleproxy
template:
- name: merge-check
- name: puppet-check-jobs
- name: infra-puppet-apply-jobs
- name: openstack-infra/puppet-snmpd
template:
- name: merge-check