diff options
| author | Kiall Mac Innes <kiall@hp.com> | 2015-04-04 15:51:48 +0100 |
|---|---|---|
| committer | Kiall Mac Innes <kiall@macinnes.ie> | 2015-04-07 19:05:28 +0000 |
| commit | 515bb38603a8a90d11fc86b1c827a1310fd774fe (patch) | |
| tree | 97ebd773f1f092050b21d9ef5f27f43b10b20dfd | |
| parent | 716fdace84baac56269fe6ad7e3682cfdb8af502 (diff) | |
| download | designate-515bb38603a8a90d11fc86b1c827a1310fd774fe.tar.gz | |
Fixup DevStack Horizon install
Change-Id: I85b7c600fe78c19d562ddcf0fcfc87dca101a2a5
| -rw-r--r-- | contrib/devstack/extras.d/70-designate.sh | 5 | ||||
| -rw-r--r-- | contrib/devstack/lib/designate | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/contrib/devstack/extras.d/70-designate.sh b/contrib/devstack/extras.d/70-designate.sh index 11309720..a8aaf781 100644 --- a/contrib/devstack/extras.d/70-designate.sh +++ b/contrib/devstack/extras.d/70-designate.sh @@ -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 diff --git a/contrib/devstack/lib/designate b/contrib/devstack/lib/designate index 10376eed..5d40b8fb 100644 --- a/contrib/devstack/lib/designate +++ b/contrib/devstack/lib/designate @@ -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 |