From d3ffe75cd128b625f8242ca34a228f51a5619baf Mon Sep 17 00:00:00 2001 From: Mikhail S Medvedev Date: Tue, 25 Nov 2014 09:56:30 -0600 Subject: [PATCH] Add puppet-elasticsearch as split out module The spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/puppet-modules.html This patch should only be approved after arranging for a system-config core to ensure there are no outstanding changes and to approve the related module removal patch within a short time. Needed-By: Id38232f6f9d928c893013c5f7eb70956955bf777 Change-Id: Ide11b4f4927fcdb4b19b2e06811f2f32c20d83f3 --- gerrit/projects.yaml | 7 +++++++ gerritbot/channels.yaml | 2 ++ jenkins/jobs/projects.yaml | 8 ++++++++ zuul/layout.yaml | 6 ++++++ 4 files changed, 23 insertions(+) diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 3030a85386..d72ecb4d65 100644 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -220,6 +220,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 upstream: git://github.com/nibalizer/openstackci-github acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml index 56d94f5d93..db78ccc10f 100644 --- a/gerritbot/channels.yaml +++ b/gerritbot/channels.yaml @@ -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 @@ -810,6 +811,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 diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index dadd7912f6..8973d66ebe 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -1947,6 +1947,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' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index afc8309c0a..2466046332 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -3437,6 +3437,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