diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 49b1379aa..43cd9c585 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -264,8 +264,9 @@ function install_designateclient { # install_designatedashboard - Collect source and prepare function install_designatedashboard { - git_clone $DESIGNATEDASHBOARD_REPO $DESIGNATEDASHBOARD_DIR $DESIGNATEDASHBOARD_BRANCH - setup_develop $DESIGNATEDASHBOARD_DIR + git_clone_by_name "designate-dashboard" + setup_dev_lib "designate-dashboard" + ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1710_project_dns_panel_group.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1710_project_dns_panel_group.py ln -fs $DESIGNATEDASHBOARD_DIR/designatedashboard/enabled/_1720_project_dns_panel.py $HORIZON_DIR/openstack_dashboard/local/enabled/_1720_project_dns_panel.py } diff --git a/devstack/settings b/devstack/settings index c36bd789c..c94d2aa09 100644 --- a/devstack/settings +++ b/devstack/settings @@ -43,8 +43,13 @@ DESIGNATE_PLUGINS=$DESIGNATE_DIR/devstack/designate_plugins # Default repositories DESIGNATE_REPO=${DESIGNATE_REPO:-${GIT_BASE}/openstack/designate.git} DESIGNATE_BRANCH=${DESIGNATE_BRANCH:-master} -DESIGNATEDASHBOARD_REPO=${DESIGNATEDASHBOARD_REPO:-${GIT_BASE}/openstack/designate-dashboard.git} -DESIGNATEDASHBOARD_BRANCH=${DESIGNATEDASHBOARD_BRANCH:-master} + +GITREPO["designate-dashboard"]=${DESIGNATEDASHBOARD_REPO:-${GIT_BASE}/openstack/designate-dashboard.git} +GITBRANCH["designate-dashboard"]=${DESIGNATEDASHBOARD_BRANCH:-master} +GITDIR["designate-dashboard"]=$DEST/designate-dashboard + +GITREPO["python-designateclient"]=${DESIGNATECLIENT_REPO:-${GIT_BASE}/openstack/python-designateclient.git} +GITBRANCH["python-designateclient"]=${DESIGNATECLIENT_BRANCH:-master} GITDIR["python-designateclient"]=$DEST/python-designateclient GITREPO["designate-tempest-plugin"]=${DESIGNATETEMPEST_REPO:-${GIT_BASE}/openstack/designate-tempest-plugin.git}