11 Commits

Author SHA1 Message Date
James E. Blair
f52d2eb2b6 Revert "Fixing deprecation warnings"
This reverts commit 82b9b59522928863ddadeacfec819e287303ef20.

Change-Id: I746d7ae57802dc76618db9024a0cf94c43774c02
2014-07-02 17:35:02 +00:00
Spencer Krum
82b9b59522 Fixing deprecation warnings
Non instance variable representation is deprecated
so needs to be changed. This change changes varibles
to their instance variable representation.

See more details see:
http://docs.puppetlabs.com/guides/templating.html

Change-Id: Ib77827e01011ef6c0380c9ec7a9d147eafd8ce2f
2014-06-19 22:41:42 -07:00
James E. Blair
8af61da62f Revert "Enable Gearman as default on Jenkins slaves"
SERVER: Invalid relationship: File[/var/lib/jenkins/hudson.plugins.gearman.GearmanPluginConfig.xml] { require => Class[Zuul] }, because Class[Zuul]doesn't seem to be in the catalog

This reverts commit 2a9cd677e4eb6a60787ebc73bd8fd9e1b6f26b34
2014-03-31 22:49:41 +00:00
iberezovskiy
2a9cd677e4 Enable Gearman as default on Jenkins slaves
We don't need to enable Gearman through Jenkins UI.
It'll we done as default.

Change-Id: I50a1506f7efa3d71034cca2caebb6e5ddb76285a
2014-03-21 12:08:31 +04:00
Jeremy Stanley
f823469514 Fix cgconfig.conf comments.
* modules/jenkins/templates/cgconfig.erb: The cgconfig service does
not handle comment lines and fails to start. There is little benefit
to embedding comments into the resulting configuration file anyway,
so instead just make them ruby comments within the template.

Change-Id: Ie749acfcd231560094137e82e048726d04944b4e
Reviewed-on: https://review.openstack.org/35715
Reviewed-by: Khai Do <zaro0508@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Elizabeth Krumbach Joseph <lyz@princessleia.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
2013-07-12 22:48:07 +00:00
Jeremy Stanley
89a92bfb3d Fedora cgroups support.
* modules/jenkins/manifests/cgroups.pp
* modules/jenkins/manifests/params.pp: Fedora separates the cgroups
management utilities into an additional package.

* modules/jenkins/templates/cgconfig.erb: Fedora already automounts
cgroups subsystems. Also, because of Red Hat bug 918951, swap
management doesn't work in Fedora 18.

Change-Id: I2366261d64c11fdc8e65a39481e8db9d589ca2de
Reviewed-on: https://review.openstack.org/34083
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-06-26 13:59:57 +00:00
Jeremy Stanley
4a19b54683 Restore cgroup-bin Upstart jobs on Ubuntu Quantal.
* modules/jenkins/files/cgroups/upstart_cgconfig: Very trivial
Upstart job to load /etc/cgconfig.conf once cgroup-lite has started.

* modules/jenkins/files/cgroups/upstart_cgred: Very trivial Upstart
job to start cgred once cgconfig has been loaded.

* modules/jenkins/manifests/cgroups.pp: Conditionally add Upstart
jobs cgconfig and cgred if Ubuntu >= 12.10. They used to exist, but
were dropped in the process of refactoring cgroup support after
Precise.

* modules/jenkins/manifests/params.pp: Add parameter lists for the
cgconfig and cgred dependencies since they differ between RHEL and
Ubuntu.

* modules/jenkins/templates/cgconfig.erb: Conditionally omit the
default cgroup mounts section on Ubuntu Quantal or later.

Change-Id: I16e2996387d534928a3cfa90de9159fbe02bbdd2
Reviewed-on: https://review.openstack.org/20638
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
2013-01-30 22:06:09 +00:00
Dan Prince
f2058ced8e Updates to the cgroups manifest to work on RHEL.
Add a new cgroup package parameter.

Update the cgroups.pp manifest to use the package params.

Also, updates the cgconfig.erb template to support Red Hat which
has slightly different cgroup mounts than Ubuntu.

Change-Id: I9bf34c93fe987c085040929ab16d5a5f5406ad47
Reviewed-on: https://review.openstack.org/18999
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
2013-01-17 18:25:13 +00:00
Monty Taylor
e35a6e7c73 Aggregate jenkins modules into one module.
Put jenkins_master into jenkins::master and jenkins_job_builder into
jenkins::job_builder and jenkins_slave into jenkins::slave.

Change-Id: Icb0e3071894730c17d8f36f49e9d34979d9c568e
Reviewed-on: https://review.openstack.org/11249
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:22:26 +00:00
Monty Taylor
be854cd76a Revert "Aggregate jenkins modules into one module."
This reverts commit 222f983fabfbf05f8aa074af90d60d7587acddfa

Change-Id: Iebc5744c5342a19aafdf24ea64e0b98812464ef4
Reviewed-on: https://review.openstack.org/11247
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:12:03 +00:00
Monty Taylor
222f983fab Aggregate jenkins modules into one module.
Put jenkins_master into jenkins::master and jenkins_job_builder into
jenkins::job_builder and jenkins_slave into jenkins::slave.

Change-Id: I2a1d242ecab0e765ab1b1556bbebd2db8f632888
Reviewed-on: https://review.openstack.org/10842
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
2012-08-12 18:03:58 +00:00