From aa5fee69b363fe14fab83394182223476747162c Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Wed, 8 Jun 2016 14:27:56 +0000 Subject: [PATCH] Reuse the puppet-openstackci zuul scheduler class Rather than maintaining a composition of classes that makes a zuul scheduler, just use openstackci::zuul_scheduler. Change-Id: I0456c1b84e24d5bc868a7d07b8cda81004d129f4 --- .../templates/puppet_profiles/zuul.pp.j2 | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 index 90affe8..61d00b4 100644 --- a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 +++ b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 @@ -1,16 +1,3 @@ class infra-ansible::profiles::zuul { - class { '::project_config': - url => 'git://git.openstack.org/openstack-infra/project-config' - } - - class { '::zuul': - gerrit_server => '{{ groups['gerrit'][0] }}', - gerrit_user => 'gerrit', - zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), - zuul_url => 'http://{{ groups['zuul'][0] }}/p', - } - - class { '::zuul::server': - layout_dir => $::project_config::zuul_layout_dir - } + include openstackci::zuul_scheduler }