Deploy Murano dashboard when murano enabled.
Change-Id: Idefc4757b4d63b783e6da7711e0388fd43f3770f
This commit is contained in:
parent
95ac80097e
commit
f83643bf05
|
@ -9,17 +9,22 @@ RUN apt-get update \
|
||||||
|
|
||||||
{{ copy_sources("openstack/horizon", "/horizon") }}
|
{{ copy_sources("openstack/horizon", "/horizon") }}
|
||||||
{{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }}
|
{{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }}
|
||||||
|
{{ copy_sources("openstack/murano-dashboard", "/murano-dashboard") }}
|
||||||
|
|
||||||
RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
|
RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon \
|
||||||
&& cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \
|
&& /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard \
|
||||||
&& /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard \
|
|
||||||
&& useradd --user-group horizon \
|
&& 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 \
|
&& 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/ \
|
&& cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
|
||||||
|
&& cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \
|
||||||
|
&& cp -r /murano-dashboard/muranodashboard/conf/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/conf/ \
|
||||||
|
&& cp -a /murano-dashboard/muranodashboard/local/enabled/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/enabled/ \
|
||||||
|
&& cp -a /murano-dashboard/muranodashboard/local/local_settings.d/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.d/ \
|
||||||
&& cp /horizon/manage.py /var/lib/microservices/venv/bin/manage.py \
|
&& cp /horizon/manage.py /var/lib/microservices/venv/bin/manage.py \
|
||||||
&& /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py collectstatic --noinput --clear \
|
&& /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py collectstatic --noinput --clear \
|
||||||
&& chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon \
|
&& chown -R horizon: /etc/openstack-dashboard /home/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/static /horizon \
|
||||||
&& /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py compress --force
|
&& /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py compress --force \
|
||||||
|
&& cd /home/horizon ; /var/lib/microservices/venv/bin/python /var/lib/microservices/venv/bin/manage.py migrate --noinput
|
||||||
|
|
||||||
ENV PATH /var/lib/venv/bin:$PATH
|
ENV PATH /var/lib/venv/bin:$PATH
|
||||||
|
|
||||||
|
|
|
@ -16,3 +16,6 @@ sources:
|
||||||
openstack/sahara-dashboard:
|
openstack/sahara-dashboard:
|
||||||
git_url: https://git.openstack.org/openstack/sahara-dashboard.git
|
git_url: https://git.openstack.org/openstack/sahara-dashboard.git
|
||||||
git_ref: stable/newton
|
git_ref: stable/newton
|
||||||
|
openstack/murano-dashboard:
|
||||||
|
git_url: http://git.openstack.org/openstack/murano-dashboard.git
|
||||||
|
git_ref: stable/newton
|
||||||
|
|
Loading…
Reference in New Issue