Consume horizon master
Previously the repository consumes horizon from amotoki's private github repository for initial testing. Let's switch it to the main horizon repository. To test this, local.conf needs to be something like below: (Patch set number may need to be changed.) ----- enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas enable_service q-fwaas-v1 enable_plugin neutron-fwaas-dashboard https://git.openstack.org/openstack/neutron-fwaas-dashboard refs/changes/13/476413/1 ----- Implement blueprint split-out-neutron-xaas-dashboards Depends-On: Ieaca88dbe28cc2330d9b333082ff7e92c91e8639 Change-Id: Ie46e54ad732e816b02d56f52b09382773f481643
This commit is contained in:
parent
388cc112e4
commit
883ded237c
|
@ -12,6 +12,12 @@ function configure_neutron_fwaas_dashboard {
|
|||
if is_service_enabled neutron-fwaas-v1-dashboard; then
|
||||
cp -a $FWAAS_ENABLED_DIR/_1460_project_firewalls_panel.py $HORIZON_ENABLED_DIR
|
||||
fi
|
||||
# The following is to make vpnaas dashboard work with
|
||||
# the master horizon with neutron vpnaas support.
|
||||
# At now it seems overriding enabled file does not work.
|
||||
# (horizon bug 1700325)
|
||||
rm -f $DEST/horizon/openstack_dashboard/enabled/_1460_project_firewalls_panel.py*
|
||||
rm -f $DEST/horizon/openstack_dashboard/enabled/__pycache__/_1460_project_firewalls_panel.*
|
||||
# NOTE: If locale directory does not exist, compilemessages will fail,
|
||||
# so check for an existence of locale directory is required.
|
||||
if [ -d $FWAAS_DASHBOARD_DIR/neutron_fwaas_dashboard/locale ]; then
|
||||
|
|
|
@ -16,8 +16,7 @@ function pip_install() {
|
|||
# and honour any/all Depends-On headers in the commit message
|
||||
function install_from_git() {
|
||||
ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
|
||||
# GIT_HOST=git.openstack.org
|
||||
GIT_HOST=github.com
|
||||
GIT_HOST=git.openstack.org
|
||||
PROJ=$1
|
||||
EGG=$2
|
||||
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -7,8 +7,7 @@ skipsdist = True
|
|||
usedevelop = True
|
||||
install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
# BRANCH_NAME=master
|
||||
BRANCH_NAME=drop-vpnaas
|
||||
BRANCH_NAME=master
|
||||
CLIENT_NAME=neutron-fwaas-dashboard
|
||||
NOSE_WITH_OPENSTACK=1
|
||||
NOSE_OPENSTACK_COLOR=1
|
||||
|
@ -17,8 +16,7 @@ setenv = VIRTUAL_ENV={envdir}
|
|||
NOSE_OPENSTACK_SHOW_ELAPSED=1
|
||||
deps = -r{toxinidir}/requirements.txt
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
os:amotoki/horizon:horizon
|
||||
# os:openstack/horizon:horizon
|
||||
os:openstack/horizon:horizon
|
||||
commands = {[unit_tests]commands}
|
||||
|
||||
[unit_tests]
|
||||
|
|
Loading…
Reference in New Issue