From e45bd6059bd4d7a7464ce95b798a758731cb829f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 17 Sep 2015 23:09:48 -0400
Subject: [PATCH] scenario002: add dashboard service

* Install & Configure Horizon
* Enable dashboard tests in Tempest
* Beside 'smoke', run 'dashboard' test

Change-Id: I5bd182ac20a03242972f5837422f98dab49c6bd4
---
 README.md               |  1 +
 fixtures/scenario002.pp | 15 ++++++++++++++-
 run_tests.sh            |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5e55d1e7b..1b12185ff 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ same node.
 | swift      |             |       X     |
 | sahara     |             |       X     |
 | trove      |      X      |             |
+| horizon    |             |       X     |
 
 When the Jenkins slave is created, the *run_tests.sh* script will executed.
 This script will execute *install_modules.sh* that prepare /etc/puppet/modules
diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index 55f5bd15c..6e38c273f 100644
--- a/fixtures/scenario002.pp
+++ b/fixtures/scenario002.pp
@@ -380,6 +380,18 @@ ring_account_device { '127.0.0.1:6002/1':
   weight => 1,
 }
 
+# Deploy Horizon
+$vhost_params = { add_listen => false }
+class { '::horizon':
+  secret_key         => 'big_secret',
+  vhost_extra_params => $vhost_params,
+  servername         => $::hostname,
+  allowed_hosts      => $::hostname,
+  # need to disable offline compression due to
+  # https://bugs.launchpad.net/ubuntu/+source/horizon/+bug/1424042
+  compress_offline   => false,
+}
+
 # Configure Tempest and the resources
 $os_auth_options = '--os-username admin --os-password a_big_secret --os-tenant-name openstack --os-auth-url http://127.0.0.1:5000/v2.0'
 
@@ -472,7 +484,7 @@ class { '::tempest':
   image_name_alt       => 'cirros_alt',
   cinder_available     => false,
   glance_available     => true,
-  horizon_available    => false,
+  horizon_available    => true,
   nova_available       => true,
   neutron_available    => true,
   ceilometer_available => false,
@@ -485,6 +497,7 @@ class { '::tempest':
   image_ssh_user       => 'cirros',
   image_alt_ssh_user   => 'cirros',
   img_file             => 'cirros-0.3.4-x86_64-disk.img',
+  dashboard_url        => "http://${::hostname}/",
   # TODO(emilien) optimization by 1/ using Hiera to configure Glance image source
   # and 2/ if running in the gate, use /home/jenkins/cache/files/ cirros image.
   # img_dir            => '/home/jenkins/cache/files',
diff --git a/run_tests.sh b/run_tests.sh
index 17655dff7..cab736155 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -92,4 +92,4 @@ fi
 wget http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img -P /tmp/openstack/tempest
 
 # run tempest smoke suite
-cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke
+cd /tmp/openstack/tempest; tox -eall -- --concurrency=2 smoke dashboard