This reverts commit 3afc75132aa3a7d3cae911ae5e7166383b9ee4ba.
The new apache module has started managing /etc/httpd/conf/httpd.conf
with a template that has some significant differences than our template
in the cgit module.
Change-Id: I99795d35596f35dfc34e89891155dd2b83e465fe
This reverts commit 7b9ea298cf4ae941af74381925b17a4b29337eb9.
Upgrading puppetlabs-apache to version 0.4.0 will give us important
variables in apache::params (specifically $conf_dir and $vdir) which
will allow us to modify the cgit module to run on both Debuntu and RHEL
systems -- which is useful because test.sh should be testing all modules
on both systems.
Of the two issues that 7b9ea298 addresses, I believe that our Oneiric
hosts have all gone the way of the dinosaur and we can work around the
docroot check by replacing 'MEANINGLESS ARGUMENT' with
'/tmp/meaningless_docroot'.
Conflicts:
install_modules.sh
Change-Id: I7c08f85db6810ab28fa044f1923833359271e8ec
This patch adds logic that can be used to clone
modules from remote git repositories and set the
resulting local repos to a know revision.
This logic has been added to make it easier to
decouple modules that are currently included as
a part of config into their own repos. Allowing
source installation will allow for edits of these
modules to be consumed more easily (without requiring
an additional release to the forge).
Additionally, this patch removes the puppet forge
installation logic that was installing without deps.
If modules are needed without their dependencies, they
can be installed from source to limit the amounts of ways
that modules can be installed.
Change-Id: I6e25cd65569f82bd5b0ef7d00b32e93ecdda3d71
Puppet board has replaced puppet dashboard. Remove reference to puppet
dashboard as it shouldn't be used.
Change-Id: I5eeee2984729ef5d1b883b4762347d19786e28ed
Use inherits keyword to bring puppetboard::params into scope
Use 2>&1 in install_modules to silence warnings
Set puppetdb class to open port 80 when puppetboard is used
Remove inherits from params check from puppet lint
Change-Id: I75fc35542e9f2641bcab613d7e1aef83d9300217
This places the puppet web dashboard puppetboard from
https://github.com/nedap/puppetboard onto the puppetdb server.
This enables anyone to see the output of puppet runs, which nodes
are failing and which nodes have not checked in over time. We can
also quickly and interactively query the facts database.
This also modifies install_modules.sh to support a list of modules
that will be installed without dependency resolution.
Change-Id: I09d09410dd8fa71759ce6b2f9c7f34f78eefe204
This brings in the puppetdb module via install_modules.sh and
creates a new class, openstack_project::puppetdb. It was modeled
on openstack_project::puppetmaster. Note that this will not enable
puppetdb to participate in the Puppet ecosystem yet. An additional
class will have to be added to the master:
class { 'puppetdb::master::config':
puppetdb_server => 'puppetdb',
}
I will leave this out of this change so we can bring up puppetdb in
stages.
This paves the way for puppetboard to be brought online.
Change-Id: I8194372bd31e08f12a815fd04dcdf338565ed911
This module confused me in that I though we were actually
using gearmand somewhere. Infra has its own version of
gearman fork in python... so no need to keep this around anymore.
This change adds a new remove_module function to install_modules.sh
and updates the script to use that function to remove gearman
and the associated dependency modules.
Change-Id: Ifc3808407eba9853b6991ef9744adb96453d46a8
* install_modules.sh: Upgrade puppetlabs-postgresql to version 3.0.0 to
fix conflicts in the concat module. Old postgresql uses ripienaar's
module other modules want puppetlabs' concat module. This upgrade resolves
that conflict.
Change-Id: I3813abea48d933421ebb4f81e84e783fa51618db
install_modules.sh: Upgrade puppetlabs-haproxy to version 0.4.1 to fix
conflicts in the concat module. Old haproxy uses ripienaar's module
other modules want puppetlabs' concat module. This upgrade resolves
that conflict.
Change-Id: Ie036091088a6c325264f8a0b4400dcf601827d50
Puppetlabs-mysql 0.6.1 correctly removes the local ::1 root user in the
account_security manifest. Upgrade to this version to take advantage of
that. Do not upgrade to latest version (0.9.0) to minimize delta that
needs testing.
Change-Id: Ic8265733f1159f34ae0afcccdea4c7d8cd44e3cb
Add a groups-dev node to openstack infra, based on drupal
environment. This node checks out the repository:
https://git.openstack.org/openstack-infra/groups
Build a new deployment from scratch, including drush make
distbuild and drush si auto-installation features.
Change-Id: I71eef1c14724ceb13a896ff768923148dedcc2ef
* install_modules.sh: Add puppetlabs-haproxy forge module.
* modules/cgit/manifests/init.pp: Add haproxy config to load balance
https, https and git protocol git access. Each git server will host git
http on port 8080, https on port 4443 and git protocol on 29418. These
endpoints will then be load balanced by a single haproxy instance
listening on ports 80, 443 and 9418. The use of haproxy and having
services listen on offset ports to accomodate haproxy is toggleable
using the $balance_git and $behind_proxy boolean flags.
Additionally, configure rsyslog for haproxy.
* modules/cgit/files/rsyslog.haproxy.conf: Enable syslog over UDP on
port 514. This is needed by haproxy to perform logging. Send local0
messages to /var/log/haproxy.log.
* modules/cgit/templates/ssl.conf.erb: Make Apache https listen port
configurable. Remove default virtualhost.
* modules/cgit/templates/httpd.conf.erb: Make Apache http listen port
configurable.
* modules/cgit/templates/git.vhost..erb: Make Apache http(s) listen
ports configuruable. Allow http without redirecting to https as a
fallback option to accomodate CentOS clients.
* modules/openstack_project/manifests/git.pp: Pass load balancer
variables through to the cgit manifest.
* manifests/site.pp: Configure git.o.o to run the load balancer haproxy
and balance across the new gitXX.o.o nodes.
Change-Id: Icefc5923cff9a7c6ce62c1923ec2ea87ebc6474a
The 0.5.0 selinux module we initially installed had a dangling
symlink bug. Upstream has fixed this in 0.5.1.
Change-Id: Ia286eb39de3ded7d407f2875fcce79f834a82aca
Reviewed-on: https://review.openstack.org/36569
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
The selinux puppet module makes it easy to change status of selinux
activation (enforcing/permissive/disabled) for CentOS/Red Hat.
Change-Id: I6e57ebbc6d78051021a2f4062edab09b92c6e03d
Reviewed-on: https://review.openstack.org/35542
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Khai Do <zaro0508@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
I got errors when I tried to use 2.0.1 on Fedora 18. Upgrading
seems to have fixed the issues.
Change-Id: I90fbf45a90e42481f48643e7fca91ba105470a7a
Reviewed-on: https://review.openstack.org/32450
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
* manifests/site.pp: Pass both jenkins.openstack.org and
jenkins-dev.openstack.org to openstack_project::zuul as the list of
gearman workers for use in iptables rules.
* modules/openstack_project/manifests/jenkins.pp
* modules/openstack_project/manifests/jenkins_dev.pp: Remove unused
4155/tcp from public allowed ports list, previously for a bzr
service which is no longer running on these servers.
* modules/openstack_project/manifests/zuul.pp: Add iptables rules
allowing access from gearman workers to the gearmand, and also
configure gearmand to listen on all addresses including IPv6, as
opposed to its IPv4-only default.
* install_modules.sh: Add puppetlabs-stdlib version 3.2.0 to the list of
puppet dependencies. This is required to pull in the "flatten" function
used in zuul.pp above.
Change-Id: I05d4abc92b3050884a7e9f3c2b6cd9dcc81bfa36
Reviewed-on: https://review.openstack.org/26245
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
Change-Id: I574bdbf3dddd5360368aa3d08ff6b25bc0beac1f
Reviewed-on: https://review.openstack.org/23463
Reviewed-by: Anita Kuno <akuno@lavabit.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins
Updates our install_modules.sh file so that it uses
puppetlabs-ntp instead of kickstandproject-ntp. This provides
better multi distro NTP support.
Change-Id: I7b11e8c67a2e38653be281b5e6aa1d08768cc617
Reviewed-on: https://review.openstack.org/23204
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Install gearman module in preparation for building out gearman servers
Change-Id: Ic2f5ec7e4506784dbb8a92068961c4e8a2fc775d
Reviewed-on: https://review.openstack.org/21147
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.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
* install_modules.sh: The puppetlabs-postgresql 2.0.1 module wants
puppetlabs-apt 1.1.0, so this should stop the schizophrenic cronspam
from repeated failed attempts to install the old version.
Change-Id: Idad5951bb7b5c941a5239a4f20b80a90ee65ac1a
Reviewed-on: https://review.openstack.org/20257
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
Add postgres servers to each non bare Jenkins slave so that tests can be
performed against postgres.
Change-Id: I374afdf2443086e2c5ad42d2e163adbf2d3df74b
Reviewed-on: https://review.openstack.org/20041
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Kurt Taylor <krtaylor@us.ibm.com>
Reviewed-by: Sean Dague <sdague@linux.vnet.ibm.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
We no longer use/need this.
Change-Id: I3474ccf8615d5392f4df514b3171e71551927fe3
Reviewed-on: https://review.openstack.org/18908
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.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
Updates install_modules so that we no longer try to install
puppet via apt-get here. This seems reasonable since we already
installed puppet 2.7 (which has 'module' support) in the
install_jenkins_slave.sh script.
The motivation for this change is to support multiple linux
distributions within openstack-infra and be able to run this
script on Red Hat linux distributions as well.
Change-Id: I1907624d1f934b832216261edf0acd87bfcc4bd2
Reviewed-on: https://review.openstack.org/18903
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Version 0.0.8 of openstackci/vcsrepo fixes a bug where you could not
checkout specific git shas. This fix will allow etherpad-dev to exactly
copy the install of etherpad.o.o.
Change-Id: I55c45a4aa5acffbbfa78ca50256dbfdf6a6ebcf4
Reviewed-on: https://review.openstack.org/18826
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
openstackci-vcsrepo 0.0.7 corrects a bug when checking out git tags.
Update to this version in order to properly checkout tags. This will
enable the install of etherpad-dev to continue.
Change-Id: Ie7ee481afc36b94723b9649486f843b128e264a9
Reviewed-on: https://review.openstack.org/17519
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
The pattern was too generous and matching multiple module lines.
Change-Id: I8ba95aeb913783139f544f85586dbae73a6bfb8f
Reviewed-on: https://review.openstack.org/14234
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Change-Id: I3e928f24b356b69109d33da3cbd751d351aee55a
Reviewed-on: https://review.openstack.org/14232
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Change-Id: I8a828f4e412950610c3ff9772255b620a1c39a16
Reviewed-on: https://review.openstack.org/14222
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
After some discussion in #openstack-infra using modules from puppetforge
is a good thing. So, this is a simple change to use an existing module
that I maintain.
Change-Id: Ic2290ef10ff96220b6620958537730e828e59402
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/13959
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Change-Id: I576128d185da81c68f652eccee2755f591ab0758
Reviewed-on: https://review.openstack.org/13651
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
puppetlabs-apache version 0.4.0 contains changes that breaks in our
environment. The two known issues are:
1. The docroot parameter is ensured by 0.4.0 to be a directory so we
cannot pass in "MEANINGLESS ARGUMENT" as the value for that parameter.
2. 0.4.0 uses the osfamily fact which was added facter version 1.6.1.
Our oneiric hosts have facter 1.5.9 installed.
To quickly get around these issues downgrade to the last version that is
known to have been working.
Change-Id: I707290621e545b8f0e96b43e99a9004605da25c2
Reviewed-on: https://review.openstack.org/12958
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
Have install_modules install module dependencies and handle module
upgrades. To make module upgrades sane, you must now specify the desired
version of a module.
Change-Id: I355308311c8555f1146999561de670294466b424
Reviewed-on: https://review.openstack.org/12732
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
We're installing it from git.
Change-Id: I694a5d1c6c6aa15cb1105d587a80d0e52e547579
Reviewed-on: https://review.openstack.org/10956
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
Change-Id: Idcf8af9712f8d10b50cfffc0aa74f7caa1a24c77
Reviewed-on: https://review.openstack.org/10833
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
Change-Id: Ia0f3acd50aab07cc83d13cd12c8f7fc67f1c697d
Reviewed-on: https://review.openstack.org/10832
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
unattended upgrades is not upgrading puppet on the slaves
in our cron jobs because we've changed puppet.conf. This brings up a
question. But, if we don't have the puppet module command, things
go poorly here - so check to see if we have it, and if not,
do an install forcing old conf values.
Change-Id: Ia84f49e165e20eba3484410a4c3c19ca62e75460
