From bdc41f2cba9d1288cd908de1b3077981172fb104 Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Mon, 15 Jan 2018 18:11:25 +0530
Subject: [PATCH] Use telemetry-tempest plugin for telemetry projects

* https://review.openstack.org/#/c/532773/ moves the gnocchi, panko,
  aodh, ceilometer tempest tests into telemetry-tempest-plugin
* Let's use it and it is available in RDO:
  https://review.rdoproject.org/r/#/c/11332/

Change-Id: Iee9ca8ff41831849f41cc016a110c7fd933d02d7
---
 manifests/init.pp   | 27 +++------------------------
 manifests/params.pp |  5 +----
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 348e73ff..02e505cb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -584,17 +584,10 @@ the future release. Please use tempest::package_ensure instead.")
   }
 
   if $manage_tests_packages {
-    if $aodh_available and $::tempest::params::python_aodh_tests {
-      package { 'python-aodh-tests':
+    if ($aodh_available or $ceilometer_available or $panko_available or $gnocchi_available) and $::tempest::params::python_telemetry_tests {
+      package { 'python-telemetry-tests':
         ensure => present,
-        name   => $::tempest::params::python_aodh_tests,
-        tag    => ['openstack', 'tempest-package'],
-      }
-    }
-    if $ceilometer_available and $::tempest::params::python_ceilometer_tests {
-      package { 'python-ceilometer-tests':
-        ensure => present,
-        name   => $::tempest::params::python_ceilometer_tests,
+        name   => $::tempest::params::python_telemetry_tests,
         tag    => ['openstack', 'tempest-package'],
       }
     }
@@ -612,20 +605,6 @@ the future release. Please use tempest::package_ensure instead.")
         tag    => ['openstack', 'tempest-package'],
       }
     }
-    if $gnocchi_available and $::tempest::params::python_gnocchi_tests {
-      package { 'python-gnocchi-tests':
-        ensure => present,
-        name   => $::tempest::params::python_gnocchi_tests,
-        tag    => ['openstack', 'tempest-package'],
-      }
-    }
-    if $panko_available and $::tempest::params::python_panko_tests {
-      package { 'python-panko-tests':
-        ensure => present,
-        name   => $::tempest::params::python_panko_tests,
-        tag    => ['openstack', 'tempest-package'],
-      }
-    }
     if $heat_available and $::tempest::params::python_heat_tests {
       package { 'python-heat-tests':
         ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index 7565d878..29768d34 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,13 +12,11 @@ class tempest::params {
         'patch',
         'gcc'
       ]
-      $python_aodh_tests       = 'python-aodh-tests'
+      $python_telemetry_tests  = 'python-telemetry-tests-tempest'
       $python_bgpvpn_tests     = 'python-networking-bgpvpn-tests-tempest'
-      $python_ceilometer_tests = 'python-ceilometer-tests'
       $python_cinder_tests     = 'python-cinder-tests'
       $python_designate_tests  = 'python-designate-tests-tempest'
       $python_glance_tests     = 'python-glance-tests'
-      $python_gnocchi_tests    = 'python-gnocchi-tests'
       $python_heat_tests       = 'python-heat-tests'
       $python_horizon_tests    = 'python-horizon-tests-tempest'
       $python_ironic_tests     = 'python-ironic-tests-tempest'
@@ -39,7 +37,6 @@ class tempest::params {
       $python_watcher_tests    = 'python-watcher-tests-tempest'
       $python_zaqar_tests      = 'python-zaqar-tests-tempest'
       $python_congress_tests   = 'python-congress-tests'
-      $python_panko_tests      = 'python-panko-tests'
       $python_octavia_tests    = 'python-octavia-tests'
       $python_ec2api_tests     = 'python-ec2-api-tests'
       $python_barbican_tests   = 'python-barbican-tests-tempest'