diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-28 15:14:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-28 15:14:34 +0000 |
| commit | c57cdb6edffb3b05598631e6ae428d3462650b9b (patch) | |
| tree | 08acce98ad96277cea35c28ca309bc32d676ed9d | |
| parent | 0c514d535bd4210776c5ab8d671d451e55e6f288 (diff) | |
| parent | 91d120cbf0951bda5bd7d96fbaef9b8e099f0bdb (diff) | |
| download | kolla-c57cdb6edffb3b05598631e6ae428d3462650b9b.tar.gz kolla-c57cdb6edffb3b05598631e6ae428d3462650b9b.zip | |
Merge "Add ironic-ui to horizon image"
| -rw-r--r-- | docker/horizon/extend_start.sh | 34 | ||||
| -rw-r--r-- | kolla/common/config.py | 4 |
2 files changed, 29 insertions, 9 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 3c618355d..3c63229b9 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -21,19 +21,35 @@ elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then SITE_PACKAGES="/var/lib/kolla/venv/lib/python2.7/site-packages" fi -function config_neutron_lbaas { - SRC="${SITE_PACKAGES}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py" - DEST="${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py" - if [[ "${ENABLE_NEUTRON_LBAAS}" == "yes" ]] && [[ ! -f ${DEST} ]]; then - cp -a $SRC $DEST +function config_dashboard { + ENABLE=$1 + SRC=$2 + DEST=$3 + if [[ "${ENABLE}" == "yes" ]] && [[ ! -f "${DEST}" ]]; then + cp -a "${SRC}" "${DEST}" FORCE_GENERATE="yes" - elif [[ "${ENABLE_NEUTRON_LBAAS}" != "yes" ]] && [[ -f ${DEST} ]]; then + elif [[ "${ENABLE}" != "yes" ]] && [[ -f "${DEST}" ]]; then # remove pyc pyo files too - rm -f ${DEST} ${DEST}c ${DEST}o + rm -f "${DEST}" "${DEST}c" "${DEST}o" FORCE_GENERATE="yes" fi } +function config_ironic_dashboard { + for file in ${SITE_PACKAGES}/ironic_ui/enabled/_*[^__].py; do + config_dashboard "${ENABLE_IRONIC}" \ + "${SITE_PACKAGES}/ironic_ui/enabled/${file##*/}" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/${file##*/}" + done +} + +function config_neutron_lbaas { + config_dashboard "${ENABLE_NEUTRON_LBAAS}" \ + "${SITE_PACKAGES}/neutron_lbaas_dashboard/enabled/_1481_project_ng_loadbalancersv2_panel.py" \ + "${SITE_PACKAGES}/openstack_dashboard/local/enabled/_1481_project_ng_loadbalancersv2_panel.py" +} + +config_ironic_dashboard config_neutron_lbaas # NOTE(pbourke): httpd will not clean up after itself in some cases which @@ -53,11 +69,11 @@ MD5SUM_TXT_PATH="/tmp/.local_settings.md5sum.txt" if [[ ! -f ${MD5SUM_TXT_PATH} || $(md5sum -c --status ${MD5SUM_TXT_PATH};echo $?) != 0 || ${FORCE_GENERATE} == "yes" ]]; then md5sum /etc/openstack-dashboard/local_settings > ${MD5SUM_TXT_PATH} if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then - /usr/bin/manage.py compress --force /usr/bin/manage.py collectstatic --noinput --clear + /usr/bin/manage.py compress --force elif [[ "${KOLLA_INSTALL_TYPE}" == "source" ]]; then - /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear + /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force fi fi diff --git a/kolla/common/config.py b/kolla/common/config.py index 1c3c5d2e4..ea7c7222a 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -214,6 +214,10 @@ SOURCES = { 'type': 'url', 'location': ('http://tarballs.openstack.org/horizon/' 'horizon-master.tar.gz')}, + 'horizon-plugin-ironic-ui': { + 'type': 'url', + 'location': ('http://tarballs.openstack.org/ironic-ui/' + 'ironic-ui-master.tar.gz')}, 'horizon-plugin-neutron-lbaas-dashboard': { 'type': 'url', 'location': ('http://tarballs.openstack.org/neutron-lbaas-dashboard/' |