From 4262ca14d0484cc6922a0f4bd322d7405c90a993 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Mon, 5 Dec 2016 12:01:19 +0800
Subject: [PATCH] Added congress service

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

diff --git a/manifests/init.pp b/manifests/init.pp
index 26160489..20d08068 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -148,6 +148,8 @@
 #   Defaults to false
 #  [*ironic_available*]
 #   Defaults to false
+#  [*congress_available*]
+#   Defaults to false
 #  [*keystone_v2*]
 #   Defaults to true
 #  [*keystone_v3*]
@@ -295,6 +297,7 @@ class tempest(
   $ec2api_available              = false,
   $mistral_available             = false,
   $vitrage_available             = false,
+  $congress_available            = false,
   $keystone_v2                   = true,
   $keystone_v3                   = true,
   $auth_version                  = 'v2',
@@ -477,6 +480,7 @@ class tempest(
     'service_available/watcher':                       value => $watcher_available;
     'service_available/zaqar':                         value => $zaqar_available;
     'service_available/ec2api':                        value => $ec2api_available;
+    'service_available/congress':                      value => $congress_available;
     'whitebox/db_uri':                                 value => $whitebox_db_uri;
     'cli/cli_dir':                                     value => $cli_dir;
     'scenario/img_dir':                                value => $img_dir;
@@ -630,6 +634,13 @@ class tempest(
         tag    => ['openstack', 'tempest-package'],
       }
     }
+    if $congress_available and $::tempest::params::congress_congress_tests {
+      package { 'python-congress-tests':
+        ensure => present,
+        name   => $::tempest::params::python_congress_tests,
+        tag    => ['openstack', 'tempest-package'],
+      }
+    }
     if $mistral_available and $::tempest::params::python_mistral_tests {
       package { 'python-mistral-tests':
         ensure => present,
diff --git a/manifests/params.pp b/manifests/params.pp
index a0158011..c58308cc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -35,6 +35,7 @@ class tempest::params {
       $python_trove_tests      = 'python-trove-tests'
       $python_watcher_tests    = 'python-watcher-tests-tempest'
       $python_zaqar_tests      = 'python-zaqar-tests'
+      $python_congress_tests   = 'python-congress-tests'
     }
     'Debian': {
       $dev_packages = [
@@ -67,6 +68,7 @@ class tempest::params {
       $python_trove_tests      = false
       $python_watcher_tests    = false
       $python_zaqar_tests      = false
+      $python_congress_tests   = false
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
diff --git a/releasenotes/notes/add_congress-879513a345de563f.yaml b/releasenotes/notes/add_congress-879513a345de563f.yaml
new file mode 100644
index 00000000..21c679a4
--- /dev/null
+++ b/releasenotes/notes/add_congress-879513a345de563f.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Add support for Congress tests.
diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb
index b7860cdb..e7427ca5 100644
--- a/spec/classes/tempest_init_spec.rb
+++ b/spec/classes/tempest_init_spec.rb
@@ -257,6 +257,7 @@ describe 'tempest' do
           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/congress').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)
           is_expected.to contain_tempest_config('cli/cli_dir').with(:value => nil)