x
/
fuel-ccp-horizon
Code Issues Proposed changes

Add sahara dashboard 

Change-Id: I300a15a3e92a2acc7f3cf191a703ab5d13b9c731
This commit is contained in:
Sergey Reshetnyak 2016-09-30 20:10:07 +03:00
parent 796cc7d9a2
commit 0b22fddaac
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/horizon/Dockerfile.j2
View File

@ -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/ \

3
service/files/defaults.yaml
View File

@ -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