From 24a1c4bf4052456aed1a72947838159b34f6c9ef Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <daniel.pawlik@corp.ovh.com>
Date: Sun, 20 Nov 2016 19:24:56 +0000
Subject: [PATCH] Added watcher service

Change-Id: I05e9f15fa8c9a6ca1992a27120ba442b35bd0f98
---
 manifests/init.pp                                    | 11 +++++++++++
 manifests/params.pp                                  |  2 ++
 releasenotes/notes/add_watcher-2f24b0881c28cd82.yaml |  3 +++
 spec/classes/tempest_init_spec.rb                    |  1 +
 4 files changed, 17 insertions(+)
 create mode 100644 releasenotes/notes/add_watcher-2f24b0881c28cd82.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 9b38f876..26160489 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,6 +128,8 @@
 #   Defaults to true
 #  [*murano_available*]
 #   Defaults to false
+#  [*watcher_available*]
+#   Defaults to false
 #  [*zaqar_available*]
 #   Defaults to false
 #  [*ec2api_available*]
@@ -288,6 +290,7 @@ class tempest(
   $swift_available               = false,
   $trove_available               = false,
   $ironic_available              = false,
+  $watcher_available             = false,
   $zaqar_available               = false,
   $ec2api_available              = false,
   $mistral_available             = false,
@@ -471,6 +474,7 @@ class tempest(
     'service_available/swift':                         value => $swift_available;
     'service_available/trove':                         value => $trove_available;
     'service_available/ironic':                        value => $ironic_available;
+    'service_available/watcher':                       value => $watcher_available;
     'service_available/zaqar':                         value => $zaqar_available;
     'service_available/ec2api':                        value => $ec2api_available;
     'whitebox/db_uri':                                 value => $whitebox_db_uri;
@@ -612,6 +616,13 @@ class tempest(
         tag    => ['openstack', 'tempest-package'],
       }
     }
+    if $watcher_available and $::tempest::params::python_watcher_tests {
+      package { 'python-watcher-tests-tempest':
+        ensure => present,
+        name   => $::tempest::params::python_watcher_tests,
+        tag    => ['openstack', 'tempest-package'],
+      }
+    }
     if $zaqar_available and $::tempest::params::python_zaqar_tests {
       package { 'python-zaqar-tests':
         ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index cc99537b..a0158011 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -33,6 +33,7 @@ class tempest::params {
       $python_sahara_tests     = 'python-sahara-tests-tempest'
       $python_swift_tests      = 'python-swift-tests'
       $python_trove_tests      = 'python-trove-tests'
+      $python_watcher_tests    = 'python-watcher-tests-tempest'
       $python_zaqar_tests      = 'python-zaqar-tests'
     }
     'Debian': {
@@ -64,6 +65,7 @@ class tempest::params {
       $python_sahara_tests     = false
       $python_swift_tests      = false
       $python_trove_tests      = false
+      $python_watcher_tests    = false
       $python_zaqar_tests      = false
     }
     default: {
diff --git a/releasenotes/notes/add_watcher-2f24b0881c28cd82.yaml b/releasenotes/notes/add_watcher-2f24b0881c28cd82.yaml
new file mode 100644
index 00000000..78fa5f77
--- /dev/null
+++ b/releasenotes/notes/add_watcher-2f24b0881c28cd82.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add support for Watcher tests.
diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index 243d2b37..b7860cdb 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -255,6 +255,7 @@ describe 'tempest' do
           is_expected.to contain_tempest_config('service_available/swift').with(:value => false)
           is_expected.to contain_tempest_config('service_available/trove').with(:value => false)
           is_expected.to contain_tempest_config('service_available/ironic').with(:value => false)
+          is_expected.to contain_tempest_config('service_available/watcher').with(:value => false)
           is_expected.to contain_tempest_config('service_available/zaqar').with(:value => false)
           is_expected.to contain_tempest_config('service_available/designate').with(:value => false)
           is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil)