diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index b33df9c..3acb439 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -8,9 +8,11 @@ RUN apt-get update \ && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load {{ copy_sources("openstack/horizon", "/horizon") }} +{{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }} RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \ - && /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /horizon/requirements.txt /horizon \ + && cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \ + && /var/lib/microservices/venv/bin/pip --no-cache-dir install --upgrade -c /horizon/requirements.txt -c /sahara-dashboard/requirements.txt /horizon /sahara-dashboard \ && useradd --user-group horizon \ && ln -s /etc/openstack-dashboard/local_settings /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index fdbe02d..480333f 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -9,3 +9,6 @@ sources: openstack/horizon: git_url: https://github.com/openstack/horizon.git git_ref: stable/newton + openstack/sahara-dashboard: + git_url: https://git.openstack.org/openstack/sahara-dashboard.git + git_ref: stable/newton