Skip to content

Bring puppetmaster up to date with what is actually deployed #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bring puppetmaster up to date with what is actually deployed #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
173d17f
Update zuul footer message (to what is deployed)
jhesketh Sep 11, 2014
11e9322
Bring turbo-hipster setup uptodate with what is deployed
jhesketh Sep 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/rcbau/files/zuul/layout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pipelines:
to: "joshua.hesketh@gmail.com, michael.still@rackspace.com"
success-message: "Experimental database migration testing successful."
failure-message: "Experimental database migration testing failed either due to migrations unable to be applied correctly or taking too long."
footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/Nova/Turbo-Hipster"
footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/ThirdPartySystems/DB_Datasets_CI"

- name: silent
manager: IndependentPipelineManager
Expand All @@ -72,7 +72,7 @@ pipelines:
to: "michael.still@rackspace.com"
success-message: "Silent test passed"
failure-message: "Silent test failed"
footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/Nova/Turbo-Hipster"
footer-message: "To recheck, leave 'recheck migrations' as a comment. More information: https://wiki.openstack.org/wiki/ThirdPartySystems/DB_Datasets_CI"

jobs:
- name: ^real-db-upgrade_.*$
Expand Down
9 changes: 3 additions & 6 deletions modules/turbo_hipster/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,15 +229,12 @@
require => File['/etc/turbo-hipster/start_TH_service.sh'],
}

package { 'virtualenvwrapper':
ensure => present,
}

# FIXME: This is a horrible hack to get a version of virtualenv >= 1.11
# This will run every time but since it's only ran once on slaves it'll do
# until we fix the versioning properly
exec { 'update virtualenv':
command => "pip install -U virtualenv pip",
exec { 'update-virtualenv':
command => "pip install -U setuptools virtualenv pip virtualenvwrapper",
path => '/usr/local/bin:/usr/bin:/bin/',
require => Class['pip'],
}

Expand Down
4 changes: 2 additions & 2 deletions modules/turbo_hipster/templates/init_turbo-hipster.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: turbo-hipster-worker-server
# Required-Start: $remote_fs $syslog
# Required-Start: $remote_fs $syslog mountnfs
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
Expand All @@ -12,7 +12,7 @@
# Do NOT "set -e"

# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/sbin
DESC="turbo-hipster CI Worker Server"
NAME=turbo-hipster-worker-server
DAEMON=/usr/local/bin/turbo-hipster
Expand Down