From e14978a3c94a39acf7c0c539dfcd01364564d111 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Wed, 14 Oct 2015 14:10:21 -0700 Subject: [PATCH] Remove mysql::python class inclusion When the dependent patch is merged, Jeepyb will depend on PyMySql and install it from pip as part of its requirements. Therefore it will no longer be necessary to include the mysql::python class, which installs the python-mysqldb package from Ubuntu packages. Removing this class inclusion will make transitioning to an up-to-date version of the mysql puppet module easier, as the current version moves the mysql::python class to mysql::bindings::python. Change-Id: I7dec1c6f588cb3e1d0eb3cb2eb6398df45ebdc22 Depends-On: I3afeaebeb8416388d5866fc3994357935079c97d --- manifests/init.pp | 3 --- 1 file changed, 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 4dcf4f2..010bb4d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,8 +4,6 @@ class jeepyb ( $git_source_repo = 'https://git.openstack.org/openstack-infra/jeepyb', $git_revision = 'master', ) { - include ::mysql::python - if ! defined(Package['python-paramiko']) { package { 'python-paramiko': ensure => present, @@ -49,7 +47,6 @@ class jeepyb ( command => 'pip install /opt/jeepyb', path => '/usr/local/bin:/usr/bin:/bin/', refreshonly => true, - require => Class['mysql::python'], subscribe => Vcsrepo['/opt/jeepyb'], logoutput => true, }