diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2
new file mode 100644
index 0000000000..5d6aa0e1e2
--- /dev/null
+++ b/docker/rally/Dockerfile.j2
@@ -0,0 +1,33 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+        openstack-rally \
+    && yum clean all \
+    && useradd --user-group rally
+
+    {% elif base_distro in ['ubuntu'] %}
+
+RUN apt-get -y install --no-install-recommends \
+        rally \
+    && apt-get clean
+
+    {% endif %}
+{% elif install_type == 'source' %}
+
+ADD rally-archive /rally-source
+RUN ln -s rally-source/* rally \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /rally \
+    && mkdir -p /etc/rally /var/log/rally \
+    && useradd --user-group rally
+
+{% endif %}
+
+RUN usermod -a -G kolla rally
+
+{{ include_footer }}
+
+USER rally
diff --git a/kolla/common/config.py b/kolla/common/config.py
index b1224d09eb..b1f2fdea16 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -240,6 +240,10 @@ SOURCES = {
         'type': 'url',
         'location': ('http://github.com/kanaka/noVNC/tarball/'
                      'v0.5.1')},
+    'rally': {
+        'type': 'url',
+        'location': ('http://tarballs.openstack.org/rally/'
+                     'rally-master.tar.gz')},
     'sahara-base': {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/sahara/'