diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 16:45:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 16:45:55 +0000 |
| commit | a6b2142cc6ea7b03e17e590675e1a104d0e01759 (patch) | |
| tree | 1e60aaa8ae63bcd91bd1c7a6ae0dc805a77c5632 | |
| parent | 8acc1771fb31979f90a50f04cdfb57012cf86fa1 (diff) | |
| parent | 3afe149e517230cf0511c692bc15b14ac9b69da0 (diff) | |
| download | kolla-a6b2142cc6ea7b03e17e590675e1a104d0e01759.tar.gz kolla-a6b2142cc6ea7b03e17e590675e1a104d0e01759.zip | |
Merge "Implement Rally Dockerfile"
| -rw-r--r-- | docker/rally/Dockerfile.j2 | 33 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 37 insertions, 0 deletions
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2 new file mode 100644 index 000000000..5d6aa0e1e --- /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 b1224d09e..b1f2fdea1 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/' |