Install sahara dashboard into horizon image
Change-Id: I0ee4672252710605970751efa756a2dd405ad8c8 Closes-Bug: #1645195
This commit is contained in:
parent
91d120cbf0
commit
366250467d
|
@ -13,7 +13,8 @@ MAINTAINER {{ maintainer }}
|
||||||
'httpd',
|
'httpd',
|
||||||
'mod_wsgi',
|
'mod_wsgi',
|
||||||
'gettext',
|
'gettext',
|
||||||
'openstack-neutron-lbaas-ui'
|
'openstack-neutron-lbaas-ui',
|
||||||
|
'openstack-sahara-ui'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
|
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
|
||||||
|
@ -29,7 +30,8 @@ RUN useradd --user-group horizon \
|
||||||
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
|
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
|
||||||
&& (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \
|
&& (cd /usr/lib/python2.7/site-packages/horizon && /usr/bin/python /usr/bin/manage.py compilemessages) \
|
||||||
&& (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) \
|
&& (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages) \
|
||||||
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_148*_project*loadbalancersv2_panel.py*
|
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_148*_project*loadbalancersv2_panel.py* \
|
||||||
|
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_18*_data_processing_*.py*
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% elif base_distro in ['ubuntu'] %}
|
{% elif base_distro in ['ubuntu'] %}
|
||||||
|
|
|
@ -49,6 +49,15 @@ function config_neutron_lbaas {
|
||||||
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
|
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function config_sahara_dashboard {
|
||||||
|
for file in ${SITE_PACKAGES}/sahara_dashboard/enabled/_*[^__].py; do
|
||||||
|
config_dashboard "${ENABLE_SAHARA}" \
|
||||||
|
"${SITE_PACKAGES}/sahara_dashboard/enabled/${file##*/}" \
|
||||||
|
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
config_sahara_dashboard
|
||||||
config_ironic_dashboard
|
config_ironic_dashboard
|
||||||
config_neutron_lbaas
|
config_neutron_lbaas
|
||||||
|
|
||||||
|
|
|
@ -222,6 +222,10 @@ SOURCES = {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/'
|
'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/'
|
||||||
'neutron-lbaas-dashboard-master.tar.gz')},
|
'neutron-lbaas-dashboard-master.tar.gz')},
|
||||||
|
'horizon-plugin-sahara-dashboard': {
|
||||||
|
'type': 'url',
|
||||||
|
'location': ('http://tarballs.openstack.org/sahara-dashboard/'
|
||||||
|
'sahara-dashboard-master.tar.gz')},
|
||||||
'ironic-base': {
|
'ironic-base': {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('http://tarballs.openstack.org/ironic/'
|
'location': ('http://tarballs.openstack.org/ironic/'
|
||||||
|
|
Loading…
Reference in New Issue