Updating branch references to stable/pike
Mostly in the devstack setup and the test-requirements. Change-Id: I787644c3cfd1003cebc5250c58e400cdb1c13e00
This commit is contained in:
parent
d649785c9e
commit
692774fb47
|
@ -8,7 +8,7 @@ Fresh Installation Steps:
|
|||
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
||||
as local.conf
|
||||
# cd devstack/
|
||||
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
|
||||
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/stable/pike/devstack/local.conf.nfp
|
||||
|
||||
(3) Configure local.conf
|
||||
# Modify NFP_DEVSTACK_MODE to 'advanced'
|
||||
|
|
|
@ -8,7 +8,7 @@ Fresh Installation Steps:
|
|||
(2) Get local.conf.nfp from NFP devstack patch and copy to devstack directory
|
||||
as local.conf
|
||||
# cd devstack/
|
||||
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/master/devstack/local.conf.nfp
|
||||
# wget -O local.conf https://raw.githubusercontent.com/openstack/group-based-policy/stable/pike/devstack/local.conf.nfp
|
||||
|
||||
(3) Install devstack.
|
||||
# ./stack.sh
|
||||
|
|
|
@ -30,6 +30,6 @@ LOGFILE=$DEST/logs/stack.sh.log
|
|||
|
||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||
|
||||
enable_plugin group-based-policy https://github.com/openstack/group-based-policy.git master
|
||||
enable_plugin group-based-policy https://github.com/openstack/group-based-policy.git stable/pike
|
||||
|
||||
ENABLE_GBP_GATE=True
|
||||
|
|
|
@ -17,7 +17,7 @@ SERVICE_TOKEN=admin
|
|||
# NFP Service
|
||||
ENABLE_NFP=True
|
||||
GBPSERVICE_REPO=https://git.openstack.org/openstack/group-based-policy.git
|
||||
GBPSERVICE_BRANCH=master
|
||||
GBPSERVICE_BRANCH=stable/pike
|
||||
# Edit NFP_DEVSTACK_MODE with either 'base' or 'advanced'
|
||||
if [[ $ENABLE_NFP = True ]]; then
|
||||
NFP_DEVSTACK_MODE=base
|
||||
|
@ -49,8 +49,8 @@ if [[ $ENABLE_NFP = True ]]; then
|
|||
enable_plugin neutron https://github.com/openstack/neutron.git stable/pike
|
||||
enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas stable/pike
|
||||
enable_plugin octavia https://git.openstack.org/openstack/octavia
|
||||
#enable_plugin barbican https://git.openstack.org/openstack/barbican master
|
||||
#enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git master
|
||||
#enable_plugin barbican https://git.openstack.org/openstack/barbican stable/pike
|
||||
#enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git stable/pike
|
||||
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -23,15 +23,15 @@ GIT_BASE=${GIT_BASE:-https://git.openstack.org}
|
|||
|
||||
# Git repositories needed to deploy GBP:
|
||||
GBPSERVICE_REPO=${GBPSERVICE_REPO:-${GIT_BASE}/openstack/group-based-policy.git}
|
||||
GBPSERVICE_BRANCH=${GBPSERVICE_BRANCH:-master}
|
||||
GBPSERVICE_BRANCH=${GBPSERVICE_BRANCH:-stable/pike}
|
||||
GBPCLIENT_REPO=${GBPCLIENT_REPO:-${GIT_BASE}/openstack/python-group-based-policy-client.git}
|
||||
GBPCLIENT_BRANCH=${GBPCLIENT_BRANCH:-master}
|
||||
GBPCLIENT_BRANCH=${GBPCLIENT_BRANCH:-stable/pike}
|
||||
GBPUI_REPO=${GBPUI_REPO:-${GIT_BASE}/openstack/group-based-policy-ui.git}
|
||||
GBPUI_BRANCH=${GBPUI_BRANCH:-master}
|
||||
GBPUI_BRANCH=${GBPUI_BRANCH:-stable/pike}
|
||||
GBPHEAT_REPO=${GBPHEAT_REPO:-${GIT_BASE}/openstack/group-based-policy-automation.git}
|
||||
GBPHEAT_BRANCH=${GBPHEAT_BRANCH:-master}
|
||||
GBPHEAT_BRANCH=${GBPHEAT_BRANCH:-stable/pike}
|
||||
AIM_BRANCH=${AIM_BRANCH:-master}
|
||||
OPFLEX_BRANCH=${OPFLEX_BRANCH:-master}
|
||||
OPFLEX_BRANCH=${OPFLEX_BRANCH:-stable/pike}
|
||||
APICAPI_BRANCH=${APICAPI_BRANCH:-master}
|
||||
|
||||
# Enable necessary services, including group-policy (and disable others)
|
||||
|
|
|
@ -12,10 +12,10 @@ SCREEN_LOGDIR=$DEST/logs/screen
|
|||
LOGFILE=$DEST/logs/stack.sh.log
|
||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||
|
||||
enable_plugin group-based-policy https://github.com/openstack/group-based-policy.git master
|
||||
enable_plugin group-based-policy https://github.com/openstack/group-based-policy.git stable/pike
|
||||
|
||||
ENABLE_APIC_AIM_GATE=True
|
||||
|
||||
AIM_BRANCH=master
|
||||
OPFLEX_BRANCH=master
|
||||
OPFLEX_BRANCH=stable/pike
|
||||
APICAPI_BRANCH=master
|
||||
|
|
|
@ -15,22 +15,22 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
|
|||
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
||||
|
||||
GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
||||
GBPSERVICE_BRANCH=master
|
||||
GBPSERVICE_BRANCH=stable/pike
|
||||
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
||||
#GBPSERVICE_BRANCH=refs/changes/85/298385/154
|
||||
|
||||
GBPCLIENT_REPO=${GIT_BASE}/openstack/python-group-based-policy-client.git
|
||||
GBPCLIENT_BRANCH=master
|
||||
GBPCLIENT_BRANCH=stable/pike
|
||||
#GBPCLIENT_REPO=https://review.openstack.org/openstack/python-group-based-policy-client
|
||||
#GBPCLIENT_BRANCH=refs/changes/95/311695/3
|
||||
|
||||
GBPUI_REPO=${GIT_BASE}/openstack/group-based-policy-ui.git
|
||||
GBPUI_BRANCH=master
|
||||
GBPUI_BRANCH=stable/pike
|
||||
#GBPUI_REPO=https://review.openstack.org/openstack/group-based-policy-ui
|
||||
#GBPUI_BRANCH=refs/changes/02/136802/14
|
||||
|
||||
GBPHEAT_REPO=${GIT_BASE}/openstack/group-based-policy-automation.git
|
||||
GBPHEAT_BRANCH=master
|
||||
GBPHEAT_BRANCH=stable/pike
|
||||
#GBPHEAT_REPO=
|
||||
#GBPHEAT_BRANCH=
|
||||
|
||||
|
|
|
@ -15,22 +15,22 @@ Q_SERVICE_PLUGIN_CLASSES=neutron.services.l3_router.l3_router_plugin.L3RouterPlu
|
|||
GIT_BASE=${GIT_BASE:-git://git.openstack.org}
|
||||
|
||||
#GBPSERVICE_REPO=${GIT_BASE}/openstack/group-based-policy.git
|
||||
GBPSERVICE_BRANCH=master
|
||||
GBPSERVICE_BRANCH=stable/pike
|
||||
#GBPSERVICE_REPO=https://review.openstack.org/openstack/group-based-policy
|
||||
#GBPSERVICE_BRANCH=refs/changes/54/240954/47
|
||||
|
||||
GBPCLIENT_REPO=${GIT_BASE}/openstack/python-group-based-policy-client.git
|
||||
GBPCLIENT_BRANCH=master
|
||||
GBPCLIENT_BRANCH=stable/pike
|
||||
#GBPCLIENT_REPO=https://review.openstack.org/openstack/python-group-based-policy-client
|
||||
#GBPCLIENT_BRANCH=refs/changes/55/435155/1
|
||||
|
||||
GBPUI_REPO=${GIT_BASE}/openstack/group-based-policy-ui.git
|
||||
GBPUI_BRANCH=master
|
||||
GBPUI_BRANCH=stable/pike
|
||||
#GBPUI_REPO=https://review.openstack.org/openstack/group-based-policy-ui
|
||||
#GBPUI_BRANCH=refs/changes/02/136802/14
|
||||
|
||||
GBPHEAT_REPO=${GIT_BASE}/openstack/group-based-policy-automation.git
|
||||
GBPHEAT_BRANCH=master
|
||||
GBPHEAT_BRANCH=stable/pike
|
||||
#GBPHEAT_REPO=
|
||||
#GBPHEAT_BRANCH=
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
-e git+https://github.com/noironetworks/apicapi.git@master#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@stable/pike#egg=python-opflexagent-agent
|
||||
|
||||
-e git+https://github.com/openstack/vmware-nsx.git@stable/pike#egg=vmware_nsx
|
||||
-e git+https://github.com/openstack/vmware-nsxlib.git@stable/pike#egg=vmware_nsxlib
|
||||
|
|
Loading…
Reference in New Issue