Fixing local.conf.nfp and READMEs to point master branch
These were not taken care while merging. Change-Id: I438d34a009e4ba760e62d551a125cc603d80335d
This commit is contained in:
parent
160cdcbbd5
commit
d2a5f5150c
|
@ -8,10 +8,7 @@ Fresh Installation Steps:
|
||||||
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
||||||
as local.conf
|
as local.conf
|
||||||
# cd devstack/
|
# cd devstack/
|
||||||
# wget -O local.conf.zip https://review.openstack.org/cat/335405,89,devstack/local.conf.nfp
|
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
|
||||||
# unzip local.conf.zip
|
|
||||||
# mv local.conf*.nfp local.conf
|
|
||||||
# rm local.conf.zip
|
|
||||||
|
|
||||||
(3) Configure local.conf
|
(3) Configure local.conf
|
||||||
# Modify NFP_DEVSTACK_MODE to 'advanced'
|
# Modify NFP_DEVSTACK_MODE to 'advanced'
|
||||||
|
|
|
@ -8,10 +8,7 @@ Fresh Installation Steps:
|
||||||
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
||||||
as local.conf
|
as local.conf
|
||||||
# cd devstack/
|
# cd devstack/
|
||||||
# wget -O local.conf.zip https://review.openstack.org/cat/335405,89,devstack/local.conf.nfp
|
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
|
||||||
# unzip local.conf.zip
|
|
||||||
# mv local.conf*.nfp local.conf
|
|
||||||
# rm local.conf.zip
|
|
||||||
|
|
||||||
(3) Install devstack.
|
(3) Install devstack.
|
||||||
# ./stack.sh
|
# ./stack.sh
|
||||||
|
|
|
@ -17,7 +17,7 @@ SERVICE_TOKEN=admin
|
||||||
# NFP Service
|
# NFP Service
|
||||||
ENABLE_NFP=True
|
ENABLE_NFP=True
|
||||||
GBPSERVICE_REPO=https://git.openstack.org/openstack/group-based-policy.git
|
GBPSERVICE_REPO=https://git.openstack.org/openstack/group-based-policy.git
|
||||||
GBPSERVICE_BRANCH=refs/changes/05/335405/89
|
GBPSERVICE_BRANCH=master
|
||||||
# Edit NFP_DEVSTACK_MODE with either 'base' or 'advanced'
|
# Edit NFP_DEVSTACK_MODE with either 'base' or 'advanced'
|
||||||
if [[ $ENABLE_NFP = True ]]; then
|
if [[ $ENABLE_NFP = True ]]; then
|
||||||
NFP_DEVSTACK_MODE=base
|
NFP_DEVSTACK_MODE=base
|
||||||
|
|
|
@ -15,7 +15,7 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
|
||||||
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
||||||
|
|
||||||
GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
||||||
#GBPSERVICE_BRANCH=master
|
GBPSERVICE_BRANCH=master
|
||||||
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
||||||
#GBPSERVICE_BRANCH=refs/changes/85/298385/154
|
#GBPSERVICE_BRANCH=refs/changes/85/298385/154
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
|
||||||
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
||||||
|
|
||||||
GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
||||||
#GBPSERVICE_BRANCH=stable/liberty
|
GBPSERVICE_BRANCH=master
|
||||||
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
||||||
#GBPSERVICE_BRANCH=refs/changes/54/240954/47
|
#GBPSERVICE_BRANCH=refs/changes/54/240954/47
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue