openstack
/
designate
Code Issues Proposed changes

Fixup DevStack Horizon install 

Change-Id: I85b7c600fe78c19d562ddcf0fcfc87dca101a2a5
This commit is contained in:
Kiall Mac Innes 2015-04-04 15:51:48 +01:00 committed by Kiall Mac Innes
parent 716fdace84
commit 515bb38603
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/devstack/extras.d/70-designate.sh
View File

@ -13,6 +13,11 @@ if is_service_enabled designate; then
echo_summary "Installing Designate Client"
install_designateclient
if is_service_enabled horizon; then
echo_summary "Installing Designate Dashboard"
install_designatedashboard
fi
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
echo_summary "Configuring Designate"
configure_designate

13
contrib/devstack/lib/designate
View File

@ -266,12 +266,6 @@ function install_designate {
setup_develop $DESIGNATE_DIR
install_designate_backend
if is_service_enabled horizon; then
ln -fs $DESIGNATE_DIR/contrib/designate-dashboard/enabled/_70_dns_add_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/70_dns_add_group.py
ln -fs $DESIGNATE_DIR/contrib/designate-dashboard/enabled/_71_dns_project.py $HORIZON_DIR/openstack_dashboard/local/enabled/71_dns_project.py
setup_develop $DESIGNATE_DIR/contrib/designate-dashboard
fi
}
# install_designateclient - Collect source and prepare
@ -280,6 +274,13 @@ function install_designateclient {
setup_develop $DESIGNATECLIENT_DIR
}
# install_designatedashboard - Collect source and prepare
function install_designatedashboard {
ln -fs $DESIGNATE_DIR/contrib/designate-dashboard/designatedashboard/enabled/_70_dns_add_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/70_dns_add_group.py
ln -fs $DESIGNATE_DIR/contrib/designate-dashboard/designatedashboard/enabled/_71_dns_project.py $HORIZON_DIR/openstack_dashboard/local/enabled/71_dns_project.py
setup_develop $DESIGNATE_DIR/contrib/designate-dashboard
}
# start_designate - Start running processes, including screen
function start_designate {
start_designate_backend