diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 6bb3c59..30b99a0 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -11,10 +11,13 @@ RUN apt-get update \ {{ copy_sources("openstack/sahara-dashboard", "/sahara-dashboard") }} {{ copy_sources("openstack/murano-dashboard", "/murano-dashboard") }} {{ copy_sources("openstack/searchlight-ui", "/searchlight-ui") }} +{{ copy_sources("openstack/designate-dashboard", "/designate-dashboard") }} RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.d \ /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/conf \ && cp -a /sahara-dashboard/sahara_dashboard/enabled/* /horizon/openstack_dashboard/local/enabled/ \ + && cp -a /designate-dashboard/designatedashboard/enabled/_1710_project_dns_panel_group.py /horizon/openstack_dashboard/local/enabled/ \ + && cp -a /designate-dashboard/designatedashboard/enabled/_1720_project_dns_panel.py /horizon/openstack_dashboard/local/enabled/ \ && cp -a /searchlight-ui/searchlight_ui/enabled/_1001_project_search_panel.py /horizon/openstack_dashboard/local/enabled/ \ && (if [ -d /murano-dashboard/muranodashboard/conf ]; then \ cp -r /murano-dashboard/muranodashboard/conf/* /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/conf/; fi) \ @@ -29,7 +32,7 @@ RUN mkdir -p /etc/openstack-dashboard /home/horizon /var/www/cgi-bin/horizon /va cp -a /searchlight-ui/searchlight_ui/conf/searchlight_policy.json /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/conf/; fi) \ && (if [ -f /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py ]; then \ cp -a /searchlight-ui/searchlight_ui/local_settings.d/_1001_search_settings.py /var/lib/microservices/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.d/; fi) \ - && /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard /searchlight-ui \ + && /var/lib/microservices/venv/bin/pip install --upgrade /horizon /sahara-dashboard /murano-dashboard /searchlight-ui /designate-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 e671149..eff2c63 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -23,3 +23,6 @@ sources: openstack/searchlight-ui: git_url: https://git.openstack.org/openstack/searchlight-ui.git git_ref: stable/newton + openstack/designate-dashboard: + git_url: https://git.openstack.org/openstack/designate-dashboard.git + git_ref: stable/newton