diff --git a/modules/jeepyb/manifests/init.pp b/modules/jeepyb/manifests/init.pp index 81801b86f8..2dd263c54a 100644 --- a/modules/jeepyb/manifests/init.pp +++ b/modules/jeepyb/manifests/init.pp @@ -3,13 +3,17 @@ class jeepyb ( $git_source_repo = 'https://github.com/openstack-ci/jeepyb.git', ) { - $packages = [ - 'python-mysqldb', - 'python-paramiko', - ] - package { $packages: - ensure => present, + if ! defined(Package['python-mysqldb']) { + package { 'python-mysqldb': + ensure => present, + } + } + + if ! defined(Package['python-paramiko']) { + package { 'python-paramiko': + ensure => present, + } } if ! defined(Package['Pygithub']) { diff --git a/modules/lodgeit/manifests/init.pp b/modules/lodgeit/manifests/init.pp index f9023b8bb5..fddbec3e71 100644 --- a/modules/lodgeit/manifests/init.pp +++ b/modules/lodgeit/manifests/init.pp @@ -7,8 +7,7 @@ class lodgeit { 'python-werkzeug', 'python-simplejson', 'python-pygments', - 'drizzle', - 'python-mysqldb' ] + 'drizzle'] include apache @@ -24,6 +23,12 @@ class lodgeit { ensure => present, } + if ! defined(Package['python-mysqldb']) { + package { 'python-mysqldb': + ensure => present, + } + } + package { 'SQLAlchemy': ensure => present, provider => pip, diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp index f90777a8f3..6e83c52738 100644 --- a/modules/zuul/manifests/init.pp +++ b/modules/zuul/manifests/init.pp @@ -15,7 +15,6 @@ class zuul ( 'python-webob', 'python-daemon', 'python-lockfile', - 'python-paramiko', 'python-paste', ] @@ -31,6 +30,12 @@ class zuul ( } } + if ! defined(Package['python-paramiko']) { + package { 'python-paramiko': + ensure => present, + } + } + # Packages that need to be installed from pip $pip_packages = [ 'GitPython',