Merge "Horizon plugin patch to let user handle BGPVPN resources"

Code Issues Proposed changes

This commit is contained in:

Jenkins

2016年09月23日 09:40:39 +00:00

committed by Gerrit Code Review

parent ac869d41df a9d92882e6

commit efd01bb30f

28 changed files with 839 additions and 512 deletions

@@ -39,8 +39,7 @@ elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then

iniset $HEAT_CONF DEFAULT plugin_dirs $NETWORKING_BGPVPN_DIR/networking_bgpvpn_heat

fi

if is_service_enabled horizon; then

cp $BGPVPN_DASHBOARD_ENABLE_ADMIN \

$HORIZON_DIR/openstack_dashboard/local/enabled/

cp $BGPVPN_DASHBOARD_ENABLE $HORIZON_DIR/openstack_dashboard/local/enabled/

fi

if [[ "1ドル" == "unstack" ]]; then

@@ -49,7 +48,7 @@ if [[ "1ドル" == "unstack" ]]; then

fi

if [[ "1ドル" == "clean" ]]; then

# Remove bgpvpn-dashboard enabled files and pyc

rm -f ${BGPVPN_DASHBOARD_ENABLE_ADMIN}*

rm -f $HORIZON_DIR/openstack_dashboard/local/enabled/*_bgpvpn_panel*

fi

# Restore XTRACE

@@ -1,6 +1,6 @@

NETWORKING_BGPVPN_DIR="$DEST/networking-bgpvpn"

NETWORKING_BGPVPN_CONF="$NEUTRON_CONF_DIR/networking_bgpvpn.conf"

BGPVPN_DASHBOARD_ENABLE_ADMIN="$NETWORKING_BGPVPN_DIR/bgpvpn_dashboard/enabled/_2115_admin_bgpvpn_panel.py"

BGPVPN_DASHBOARD_ENABLE="$NETWORKING_BGPVPN_DIR/bgpvpn_dashboard/enabled/*"

BGPVPN_PLUGIN_CLASS="networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin"

NETWORKING_BGPVPN_DRIVER=${NETWORKING_BGPVPN_DRIVER:-BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default}