From c7d8ecbd2c694a4bfefed1e90097485147bbf7e5 Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Tue, 19 May 2020 18:43:20 +0100 Subject: [PATCH] Use py3 with elastic-recheck Change-Id: I90c3784eb8c93616cba1270cd7c5a9babb5c440f Depends-On: https://review.opendev.org/#/c/729543/ --- manifests/bot.pp | 2 +- manifests/init.pp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/bot.pp b/manifests/bot.pp index cd03e72..c3343ca 100644 --- a/manifests/bot.pp +++ b/manifests/bot.pp @@ -29,7 +29,7 @@ class elastic_recheck::bot ( $recheck_ssh_public_key = undef, $subunit2sql_db_uri = 'mysql+pymysql://query:query@logstash.openstack.org/subunit2sql', ) { - include ::elastic_recheck + include elastic_recheck file { '/etc/elastic-recheck/elastic-recheck.conf': ensure => present, diff --git a/manifests/init.pp b/manifests/init.pp index 53c5fd0..56d6b28 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -39,13 +39,13 @@ class elastic_recheck ( source => $git_source_repo, } - include ::pip + include pip3 exec { 'install_elastic-recheck' : - command => 'pip install /opt/elastic-recheck', + command => 'pip3 install /opt/elastic-recheck', path => '/usr/local/bin:/usr/bin:/bin/', refreshonly => true, subscribe => Vcsrepo['/opt/elastic-recheck'], - require => Class['pip'], + require => Class['pip3'], } file { '/usr/local/bin/er_safe_run.sh':