openstack
/
tacker
Code Issues Proposed changes

Merge "Fix the branch names in local.conf and lib/tacker" into stable/newton

This commit is contained in:
Jenkins 2016-11-21 02:10:45 +00:00 committed by Gerrit Code Review
parent 6d007b1031 44608ec87d
commit b2b6c2dc14
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/lib/tacker
View File

@ -40,7 +40,7 @@ fi
# Set up default directories
GITREPO["tacker-horizon"]=${TACKERHORIZON_REPO:-${GIT_BASE}/openstack/tacker-horizon.git}
GITBRANCH["tacker-horizon"]=${TACKERHORIZON_BRANCH:-master}
GITBRANCH["tacker-horizon"]=${TACKERHORIZON_BRANCH:-stable/newton}
GITDIR["tacker-horizon"]=$DEST/tacker-horizon
TACKER_DIR=$DEST/tacker

4
devstack/local.conf.example
View File

@ -50,8 +50,8 @@ NETWORK_GATEWAY=${NETWORK_GATEWAY:-15.0.0.1}
FIXED_RANGE=${FIXED_RANGE:-15.0.0.0/24}
enable_plugin tacker https://git.openstack.org/openstack/tacker master
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc master
enable_plugin tacker https://git.openstack.org/openstack/tacker stable/newton
enable_plugin networking-sfc git://git.openstack.org/openstack/networking-sfc stable/newton
enable_service n-novnc
enable_service n-cauth