openstack
/
designate
Code Issues Proposed changes

Update devstack dashboard+client clone+install method 

This updates our devstack plugin to use the current clone+install
method for the client (missing vars) and dashboard (replaced with
the new method).

Designate itself is still using old vars, but I suspect this is
a leftover and there's really no need for Designate to try
clone itself since the plugin is inline now...

Change-Id: I2189abc196d74520fa3fae0da215a1c6dd891387
This commit is contained in:
Kiall Mac Innes 2016-05-16 18:11:19 +01:00
parent 96de5c139b
commit b4cd2c8042
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/plugin.sh
View File

@ -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
}

9
devstack/settings
View File

@ -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}