7549 Commits

Author SHA1 Message Date
James E. Blair
542e170b81 Keep environment for cloner in apply test sudo
The zuul cloner needs the ZUUL_* env vars when setting up projects
for the new apply integration test.

Also, add some more debugging to both versions of the test.

Change-Id: I486b19cecd034250068e4a59604e1e0ca90ed83d
2014-09-15 13:19:37 -07:00
Jenkins
c2458d305b Merge "Pin puppetdb to 2.x" 2014-09-15 17:16:00 +00:00
Jenkins
0879e87407 Merge "Revert "Stop managing puppet apt pins"" 2014-09-15 17:15:35 +00:00
Jenkins
dff292d9d2 Merge "Update comments in puppet default" 2014-09-15 17:10:39 +00:00
Jenkins
d00762e370 Merge "Add more @ signs to logs-dev and status vhosts" 2014-09-15 17:09:29 +00:00
Jenkins
1a109e7431 Merge "Update StackForge doc for Zuul project templates" 2014-09-15 13:59:46 +00:00
Jeremy Stanley
fcd1a57d30 Pin puppetdb to 2.x
As we discovered in the course of upgrading puppetboard the puppetdb
package is upgraded independently of the puppetdb-terminus package,
but in fact it will break if they don't match. We now pin them to
the same values for safety.

Change-Id: I628129997e084ec5e4cb18947fa7e2362c9b4ba5
2014-09-14 16:27:07 +00:00
Jeremy Stanley
1165f4f039 Replace old puppet master with new in cacti
Stop collecting stats from ci-puppetmaster.openstack.org which is
now no longer in use, and start collecting stats from our new Puppet
3 based puppetmaster.openstack.org instead.

Change-Id: I640d64b6219f32f06bfcfd11e5aea9fc20277a08
2014-09-13 16:37:08 +00:00
Jenkins
9dbb5c6544 Merge "Drop apache::dev in wiki" 2014-09-12 22:56:40 +00:00
James E. Blair
26ff9a7300 Drop apache::dev in wiki
The version in puppetlabs-apache 0.0.4 is not puppet3 compat.

Change-Id: I1ad9053fa9da374f57767079138b0c0063052795
2014-09-12 14:15:16 -07:00
James E. Blair
974c7aa990 Revert "Stop managing puppet apt pins"
This reverts commit 5be2e2f18ac1f4489be760717519252ba20d4fba.

Yay!  We've sucessfully upgraded to puppet3 and the sun is shining!
Start managing apt pins for puppet again, and also, set the default
to be 3.x everywhere.

Change-Id: I80db5b5e154a3849914aa348e1eabadd0a2ad936
2014-09-12 13:34:11 -07:00
James E. Blair
def85f8340 Also stop managing yum puppet pins
Change-Id: I589146eb9dceed5f560e4986920dbc22a53ea8cd
2014-09-12 13:29:30 -07:00
James E. Blair
6fd9f37d96 Update comments in puppet default
The default file has changed in the latest puppet packages, update
the comments to keep diff churn down.

Change-Id: I78bbcd2b4ea848640cfcf4d1214eea107548ef58
2014-09-12 12:13:58 -07:00
Jenkins
1fd36481ce Merge "Add more @ signs to meetbot vhost" 2014-09-12 18:30:16 +00:00
Jenkins
9581c3a148 Merge "Drop 90 servers from rax-dfw" 2014-09-12 18:03:17 +00:00
Jenkins
ff10d4cb1d Merge "Add apache envvars file for puppetmaster" 2014-09-12 17:56:22 +00:00
James E. Blair
fcf7b069c1 Add more @ signs to logs-dev and status vhosts
To make puppet more happy.

Change-Id: I22755ef7d7772b2dbf68b0663985785f50767d14
2014-09-12 10:43:55 -07:00
James E. Blair
bd8a9189c5 Add more @ signs to meetbot vhost
Because puppet likes @ signs now.

Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
2014-09-12 10:42:05 -07:00
Jenkins
d7d4499b5a Merge "Add etherpadlite server admin variable" 2014-09-12 17:31:28 +00:00
James E. Blair
3faf809d61 Drop 90 servers from rax-dfw
dfw is having trouble recycling ip addrs fast enough; request
fewer servers from it to attempt to give it a better chance to
succeed.

Change-Id: I368af7192f5a3e7e2c67b774372505a40f691533
2014-09-12 09:56:29 -07:00
Jenkins
09a9de6222 Merge "Install puppetmaster-passenger on puppetmasters" 2014-09-12 16:51:11 +00:00
James E. Blair
e0c593268a Add apache envvars file for puppetmaster
To set the LANG env variable to utf8.

Change-Id: I8ab13568a072a4993a2263cad425b926eec562d5
2014-09-12 09:42:51 -07:00
Clark Boylan
6ce33263e0 Add etherpadlite server admin variable
The etherpad lite vhost template expects a server admin variable in the
etherpad_lite::apache manifest. Add one with a default of
webmaster@$fqdn.

Change-Id: Id974496ec330fa1453bc60d65518f4264f107da7
2014-09-12 09:02:21 -07:00
Jenkins
ca82fac6ec Merge "Fixing deprecation warnings in gerrit module" 2014-09-12 15:36:34 +00:00
Spencer Krum
0cdd107a45 Fixing variable access in logstash module
Change-Id: Ic54a3e0c423e71e4030a92972239a2b145522550
2014-09-11 16:26:22 -07:00
Jenkins
0055d6c22c Merge "Fix ruby-191-prep to install bundler" 2014-09-11 23:01:33 +00:00
Spencer Krum
c584f63aa6 Allow ssh from the new puppetmaster
Remove old ssh_authorized_key entry

Change-Id: Iec8ca703383650e39a3b2d33d2909d11d1b723a5
2014-09-11 15:09:49 -07:00
Jenkins
cf78951de7 Merge "Add production environment to puppet" 2014-09-11 21:57:46 +00:00
Jenkins
814adfc6a2 Merge "Remove update_slave from puppetmaster" 2014-09-11 21:44:32 +00:00
Spencer Krum
84306bdc3c Add production environment to puppet
This creates an environment.conf for production for use
with Puppet directory environments.

Change-Id: I12655eb480ec95293edf8b3534c5b607de2980de
2014-09-11 14:24:42 -07:00
Mark Vanderwiel
25a4c5d407 Fix ruby-191-prep to install bundler
Still trying to get ruby 1.9.x as default for gate jobs on precise.
* install the bundler gem under 1.9.x
* make sure do to update before trying to install libgecode-dev

Change-Id: I61df9fd3a94670bb10bac8bb4d820a66f25d7675
Closes-Bug: #1357439
2014-09-11 16:22:53 -05:00
James E. Blair
093e9c525d Remove update_slave from puppetmaster
This was added for the puppet3 transition but is no longer needed
with the way we are using ansible.

Change-Id: Iac45771b64434fb36322dd91cc73e13e859724db
2014-09-11 14:12:36 -07:00
Jenkins
be90bc1c50 Merge "Do not generate new translation proposal if one is in the gate" 2014-09-11 20:28:00 +00:00
Andreas Jaeger
675cdf8d66 Do not generate new translation proposal if one is in the gate
Do not generate a new translation proposal patch if there is currently
an approved patch in the queue.

This helps with overlong queues or approvals close to the job run.

Change-Id: I1ca73a03c67b34878244a3ebd926eb9bd60845f7
2014-09-11 21:25:56 +02:00
Clark Boylan
998befd53a Install puppetmaster-passenger on puppetmasters
We serve our puppetmasters via apache and mod passenger. Install the
puppetmaster-passenger package to have it set that up for us.

Change-Id: Icb9ee005fa9b450162a5e6a3e8045425e453e9ec
2014-09-11 10:57:51 -07:00
James E. Blair
5c1b663f30 Plumb puppetmaster through ansible task
The previous change to make the puppetmaster configurable in the ansible
playbook omitted passing through the parameter in the task.  Also, add
the parameter to the module docs.

Change-Id: I6bcd58803fd11c3d64608ea1d9fca269042936b4
2014-09-11 10:47:11 -07:00
Jenkins
7a19e14546 Merge "Add Tricircle project" 2014-09-11 02:44:55 +00:00
Jenkins
9415fbfe6f Merge "Make ansible speak to appropriate puppetmaster" 2014-09-10 23:47:42 +00:00
Clark Boylan
07d8b0ff24 Make ansible speak to appropriate puppetmaster
With split puppet master infrastructure ansible needs to be told which
puppetmaster to talk to. Do this by making puppetmaster a required
argument to the puppet ansible playbook.

Since we can't rely on the cert listing while this is happening also add
puppet master specific host list files which can be used to specify
which hosts talk to which puppetmaster via the new ansible playbook
feature.

Change-Id: I412c2bd6cb390d00d1b9d0e4630e75776edabbb9
2014-09-10 16:09:06 -07:00
Jenkins
ad60f59667 Merge "puppetmaster is a CA" 2014-09-10 23:07:11 +00:00
James E. Blair
5be2e2f18a Stop managing puppet apt pins
We're going to upgrade puppet2 to puppet3 on each host individually.
Stop managing the apt pins during the transition so that sysadmins
can edit the files directly.

Change-Id: Ia7f3cdc33a4451652387dbd051f4429af8d6f434
2014-09-10 13:15:56 -07:00
Spencer Krum
b16ea8906e puppetmaster is a CA
Change-Id: Ifa448e845259e7de8f13bfef420c3ea481cbda24
2014-09-10 12:48:33 -07:00
James E. Blair
e6775bd7b5 Fix variable ref error in launch node
The new code to create volumes incorrectly affects the non-volume
case due to an indentation bug.  This corrects that.

Change-Id: I18eb1222447393e769fbbbf550407bf103b11e99
2014-09-10 10:37:09 -07:00
Jenkins
f637e3bee3 Merge "Updating node defn for puppet 3 master" 2014-09-10 17:25:23 +00:00
Spencer Krum
9dcbfe6fbb Updating node defn for puppet 3 master
This updates puppet version to 3.6

Change-Id: I37879153c68011c752919675a2d3416383aaf8e5
2014-09-10 09:49:01 -07:00
Jenkins
c1d7c693fb Merge "Add integration apply test" 2014-09-10 16:44:26 +00:00
Jenkins
b01f4960fe Merge "Switch to using single projects yaml job" 2014-09-10 16:20:38 +00:00
Jenkins
daaa995546 Merge "Enable puppet3 master bootstrap" 2014-09-10 16:11:47 +00:00
Jenkins
9ab24352cc Merge "Formatting updates in hiera.yaml" 2014-09-10 16:08:06 +00:00
Andreas Jaeger
79878cc750 Fix pattern match for translations
Fix the pattern match so that the if condition matches files
ending with ".po"

Change-Id: I69aea5703438fa354a7ec4a7d4ec578fc7d631cb
2014-09-10 08:53:30 +02:00