Merge "install murano dashboard package in horizon"
This commit is contained in:
commit
d025182ed5
|
@ -18,6 +18,7 @@ MAINTAINER {{ maintainer }}
|
||||||
'openstack-cloudkitty-ui',
|
'openstack-cloudkitty-ui',
|
||||||
'openstack-manila-ui',
|
'openstack-manila-ui',
|
||||||
'openstack-mistral-ui',
|
'openstack-mistral-ui',
|
||||||
|
'openstack-murano-ui',
|
||||||
'openstack-neutron-lbaas-ui',
|
'openstack-neutron-lbaas-ui',
|
||||||
'openstack-sahara-ui',
|
'openstack-sahara-ui',
|
||||||
'openstack-trove-ui'
|
'openstack-trove-ui'
|
||||||
|
@ -33,12 +34,10 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
||||||
&& chown -R apache: /usr/share/openstack-dashboard/static \
|
&& chown -R apache: /usr/share/openstack-dashboard/static \
|
||||||
&& sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
|
&& sed -i "s|WEBROOT = '/dashboard/'|WEBROOT = '/'|" /etc/openstack-dashboard/local_settings \
|
||||||
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
|
&& cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \
|
||||||
|
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/?[^_]*.py* \
|
||||||
|
&& rm -f /usr/lib/python2.7/site-packages/openstack_dashboard/local/enabled/?[^_]*.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/_18*_data_processing_*.py* \
|
|
||||||
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_database*.py* \
|
|
||||||
&& rm -f /usr/share/openstack-dashboard/openstack_dashboard/local/enabled/_17*_panel*.py*
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% elif base_distro in ['ubuntu'] %}
|
{% elif base_distro in ['ubuntu'] %}
|
||||||
|
@ -48,7 +47,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
|
||||||
'apache2',
|
'apache2',
|
||||||
'libapache2-mod-wsgi',
|
'libapache2-mod-wsgi',
|
||||||
'gettext',
|
'gettext',
|
||||||
'python-manila-ui'
|
'python-manila-ui',
|
||||||
|
'python-murano-dashboard'
|
||||||
] %}
|
] %}
|
||||||
|
|
||||||
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
|
{{ macros.install_packages(horizon_packages | customizable("packages")) }}
|
||||||
|
|
|
@ -83,6 +83,21 @@ function config_manila_ui {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function config_murano_dashboard {
|
||||||
|
for file in ${SITE_PACKAGES}/muranodashboard/local/enabled/_*[^__].py; do
|
||||||
|
config_dashboard "${ENABLE_MURANO}" \
|
||||||
|
"${SITE_PACKAGES}/muranodashboard/local/enabled/${file##*/}" \
|
||||||
|
"${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}"
|
||||||
|
done
|
||||||
|
config_dashboard "${ENABLE_MURANO}"\
|
||||||
|
"${SITE_PACKAGES}/muranodashboard/conf/murano_policy.json" \
|
||||||
|
"${SITE_PACKAGES}/openstack_dashboard/conf/murano_policy.json"
|
||||||
|
|
||||||
|
config_dashboard "${ENABLE_MURANO}"\
|
||||||
|
"${SITE_PACKAGES}/muranodashboard/local/local_settings.d/_50_murano.py" \
|
||||||
|
"${SITE_PACKAGES}/openstack_dashboard/local/local_settings.d/_50_murano.py"
|
||||||
|
}
|
||||||
|
|
||||||
function config_mistral_dashboard {
|
function config_mistral_dashboard {
|
||||||
config_dashboard "${ENABLE_MISTRAL}" \
|
config_dashboard "${ENABLE_MISTRAL}" \
|
||||||
"${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \
|
"${SITE_PACKAGES}/mistral_dashboard/_50_mistral.py.example" \
|
||||||
|
@ -174,6 +189,7 @@ config_karbor_dashboard
|
||||||
config_magnum_dashboard
|
config_magnum_dashboard
|
||||||
config_manila_ui
|
config_manila_ui
|
||||||
config_mistral_dashboard
|
config_mistral_dashboard
|
||||||
|
config_murano_dashboard
|
||||||
config_neutron_lbaas
|
config_neutron_lbaas
|
||||||
config_sahara_dashboard
|
config_sahara_dashboard
|
||||||
config_searchlight_ui
|
config_searchlight_ui
|
||||||
|
|
|
@ -322,6 +322,11 @@ SOURCES = {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('$tarballs_base/monasca-ui/'
|
'location': ('$tarballs_base/monasca-ui/'
|
||||||
'monasca-ui-1.2.1.tar.gz')},
|
'monasca-ui-1.2.1.tar.gz')},
|
||||||
|
'horizon-plugin-murano-dashboard': {
|
||||||
|
'type': 'url',
|
||||||
|
'location': ('$tarballs_base/murano-dashboard/'
|
||||||
|
'murano-dashboard-master.tar.gz')},
|
||||||
|
|
||||||
'horizon-plugin-neutron-lbaas-dashboard': {
|
'horizon-plugin-neutron-lbaas-dashboard': {
|
||||||
'type': 'url',
|
'type': 'url',
|
||||||
'location': ('$tarballs_base/neutron-lbaas-dashboard/'
|
'location': ('$tarballs_base/neutron-lbaas-dashboard/'
|
||||||
|
|
Loading…
Reference in New Issue