x/group-based-policy
Code Issues Proposed changes

Move apicapi dependency to master branch

Browse Source 
Change-Id: Ib43c0b30deb4b72e9df8fe45085a6ca7896704d0
This commit is contained in:
Sumit Naiksatam
2017-04-12 11:34:37 -07:00
parent f9554090e6
commit e7b45aaac0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/settings
View File

@@ -31,7 +31,7 @@ GBPHEAT_BRANCH=${GBPHEAT_BRANCH:-master}
AIM_BRANCH=${AIM_BRANCH:-master} AIM_BRANCH=${AIM_BRANCH:-master}
APICML2_BRANCH=${APICML2_BRANCH:-master} APICML2_BRANCH=${APICML2_BRANCH:-master}
OPFLEX_BRANCH=${OPFLEX_BRANCH:-master} OPFLEX_BRANCH=${OPFLEX_BRANCH:-master}
APICAPI_BRANCH=${APICAPI_BRANCH:-aci_integration_manager} APICAPI_BRANCH=${APICAPI_BRANCH:-master}
# Enable necessary services, including group-policy (and disable others) # Enable necessary services, including group-policy (and disable others)
disable_service n-net disable_service n-net

3
test-requirements.txt
View File

@@ -4,8 +4,7 @@
-e git+https://git.openstack.org/openstack/neutron.git@stable/newton#egg=neutron -e git+https://git.openstack.org/openstack/neutron.git@stable/newton#egg=neutron
# TODO(rkukura): Switch apicapi back to master branch eventually. -e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
-e git+https://github.com/noironetworks/apicapi.git@aci_integration_manager#egg=apicapi
-e git+https://github.com/noironetworks/python-opflex-agent.git@master#egg=python-opflexagent-agent -e git+https://github.com/noironetworks/python-opflex-agent.git@master#egg=python-opflexagent-agent
-e git+https://github.com/noironetworks/apic-ml2-driver.git@master#egg=apic_ml2 -e git+https://github.com/noironetworks/apic-ml2-driver.git@master#egg=apic_ml2