Use pip install instead of setup.py install

The pip vs. easy_install interactions continually get the systems
into a weird state. pip install $path_to_repo, on the other hand,
works like a charm.

Left out two graphite installs because they are doing path manipulation
and I want to do further testing before touching that.

Change-Id: I373b29aca03f1ebd20e533ebaaf5de9ef2db017e
This commit is contained in:
Monty Taylor 2013-10-10 14:17:16 -04:00
parent 90ab8cd5ac
commit 0222d3040e
8 changed files with 16 additions and 24 deletions

View File

@ -46,9 +46,8 @@ class elastic_recheck (
include pip
exec { 'install_elastic-recheck' :
command => 'python setup.py install',
cwd => '/opt/elastic-recheck',
path => '/bin:/usr/bin',
command => 'pip install /opt/elastic-recheck',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
notify => Service['elastic-recheck'],
subscribe => Vcsrepo['/opt/elastic-recheck'],

View File

@ -60,9 +60,8 @@ class graphite(
}
exec { 'install_whisper' :
command => 'python setup.py install',
cwd => '/opt/whisper',
path => '/bin:/usr/bin',
command => 'pip install /opt/whisper',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/whisper'],
}

View File

@ -69,9 +69,8 @@ class jeepyb (
}
exec { 'install_jeepyb' :
command => 'python setup.py install',
cwd => '/opt/jeepyb',
path => '/bin:/usr/bin',
command => 'pip install /opt/jeepyb',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
require => Class['mysql::python'],
subscribe => Vcsrepo['/opt/jeepyb'],

View File

@ -28,9 +28,8 @@ class jenkins::job_builder (
}
exec { 'install_jenkins_job_builder':
command => 'python setup.py install',
cwd => '/opt/jenkins_job_builder',
path => '/bin:/usr/bin',
command => 'pip install /opt/jenkins_job_builder',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/jenkins_job_builder'],
}

View File

@ -78,9 +78,8 @@ class nodepool (
}
exec { 'install_nodepool' :
command => 'python setup.py install',
cwd => '/opt/nodepool',
path => '/bin:/usr/bin',
command => 'pip install /opt/nodepool',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/nodepool'],
require => Class['pip'],

View File

@ -335,9 +335,8 @@ class openstack_project::static (
include pip
exec { 'install_elastic-recheck' :
command => 'python setup.py install',
cwd => '/opt/elastic-recheck',
path => '/bin:/usr/bin',
command => 'pip install /opt/elastic-recheck',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/elastic-recheck'],
require => Class['pip'],

View File

@ -33,9 +33,8 @@ class statusbot(
}
exec { 'install_statusbot' :
command => 'python setup.py install',
cwd => '/opt/statusbot',
path => '/bin:/usr/bin',
command => 'pip install /opt/statusbot',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/statusbot'],
}

View File

@ -87,9 +87,8 @@ class zuul (
}
exec { 'install_zuul' :
command => 'python setup.py install',
cwd => '/opt/zuul',
path => '/bin:/usr/bin',
command => 'pip install /opt/zuul',
path => '/usr/local/bin:/usr/bin:/bin/',
refreshonly => true,
subscribe => Vcsrepo['/opt/zuul'],
require => Class['pip'],