From 8c49f9b766f5d32c59d2e43e0cf132bc083ec518 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Thu, 7 May 2015 20:42:36 +0200
Subject: [PATCH] Add rally alias to the webserver

Change-Id: Id97067bb284ad01eb18e9c71ff48e037e7f10f07
---
 ansible/controller.yaml |  1 +
 doc/source/usage.rst    |  7 +++++++
 files/rally.sh          | 17 +++++++++++++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ansible/controller.yaml b/ansible/controller.yaml
index bcb8622..476ef2b 100644
--- a/ansible/controller.yaml
+++ b/ansible/controller.yaml
@@ -18,6 +18,7 @@
 - template: src=files/openrc.j2 dest=/home/vagrant/openrc owner=vagrant group=vagrant mode=0644
 - lineinfile: dest=/home/vagrant/.bashrc line='source $HOME/openrc'
 - copy: src=files/setup.sh dest=/home/vagrant/scripts/setup.sh owner=vagrant group=vagrant mode=0755
+- copy: src=files/rally.sh dest=/home/vagrant/scripts/rally.sh owner=vagrant group=vagrant mode=0755
 - filesystem: fstype=xfs dev=/dev/sdb force=yes
 - filesystem: fstype=xfs dev=/dev/sdc force=yes
 - template: src=files/packstack.answers.j2 dest=/home/vagrant/packstack.answers owner=vagrant group=vagrant
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index 4034b7e..3aa9466 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -28,3 +28,10 @@ APIs
 All OpenStack API services are running on the controller node with the
 default IP address ``10.100.50.10``.
 
+Rally
+-----
+
+Install `Rally <https://github.com/openstack/rally>`_, a framework for
+performance analysis and benchmarking of individual OpenStack components,
+with ``/home/vagrant/scripts/rally.sh`` to ``/opt/rally``. The directory
+is accessible through the webserver, by default at http://10.100.50.10/rally/.
diff --git a/files/rally.sh b/files/rally.sh
index 5c0acbc..1592fc9 100644
--- a/files/rally.sh
+++ b/files/rally.sh
@@ -2,11 +2,24 @@
 
 # https://rally.readthedocs.org/en/latest/install.html#automated-installation
 
-cd /home/vagrant
+cd /opt
 sudo yum install -y git
-git clone https://git.openstack.org/openstack/rally
+sudo git clone https://git.openstack.org/openstack/rally
+sudo chown -R vagrant:vagrant rally
 sudo ./rally/install_rally.sh
 rally-manage db recreate
 source /home/vagrant/openrc
 rally deployment create --fromenv --name=packstack
 rally deployment check
+
+cat <<EOT | sudo tee /etc/httpd/conf.d/rally.conf
+Alias /rally "/opt/rally"
+<Directory "/opt/rally">
+  Options +Indexes
+  AllowOverride None
+  Require all granted
+</Directory>
+EOT
+
+sudo sed -i "s#</VirtualHost>#  Include /etc/httpd/conf.d/rally.conf\n</VirtualHost>#" /etc/httpd/conf.d/15-horizon_vhost.conf
+sudo systemctl restart httpd