Skip to content

Updated gen-local.sh to support Janus plugin #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: silver
Choose a base branch
from
Open

Updated gen-local.sh to support Janus plugin #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions samples/of/ctrl-localrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ REGIONS=${REGIONS}

# JANUS
SDI_ENABLED_ENABLED_SERVICES=$ENABLED_SERVICES,janus,whale,w-sync,w-api,neo4j
#SDI_ENABLED_JANUS_API_HOST=${PUBLIC_SERVICE_HOST}
#SDI_ENABLED_JANUS_API_PORT=8091
SDI_ENABLED_JANUS_API_HOST=${PUBLIC_SERVICE_HOST}
SDI_ENABLED_JANUS_API_PORT=8091
19 changes: 8 additions & 11 deletions samples/of/gen-local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,18 +282,15 @@ if [[ "$USE_OF" == "y" || "$USE_OF" == "Y" ]]; then

if [[ $AGENT == 0 ]]; then
read -p "Do you want to use SDI Manager? ([y]/n) " SDI_ENABLED
if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
USE_SDI=false
else
USE_SDI=true
fi
else
read -p "Is the SDI Manager in use on the controller node? ([n]/y)" SDI_ENABLED
if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
USE_SDI=false
else
USE_SDI=true
fi
read -p "Is the SDI Manager in use on the controller node? ([y]/n)" SDI_ENABLED
fi

if [[ "$SDI_ENABLED" == "n" || "$SDI_ENABLED" == "N" ]]; then
USE_SDI=false
else
USE_SDI=true
Q_PLUGIN=janus
fi
echo ''
fi
Expand Down
6 changes: 5 additions & 1 deletion samples/tr-edge-1/local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,11 @@ is baremetal_pxe_vlan_per_host $BM_PXE_PER_NODE
is baremetal_pxe_parent_interface $BM_PXE_INTERFACE
is firewall_driver ""
isb firewall_driver ""
is baremetal_vif_driver nova.virt.baremetal.ryu.ryu_vif_driver.RyuVIFDriver
if [[ "$Q_PLUGIN" = "ryu" ]]; then
is baremetal_vif_driver nova.virt.baremetal.ryu.ryu_vif_driver.RyuVIFDriver
elif [[ "$Q_PLUGIN" = "janus" ]]; then
is baremetal_vif_driver nova.virt.baremetal.janus.janus_vif_driver.JanusVIFDriver
fi
is host $BMC_HOST
isb host $BEE2_HOST
iso host `hostname -f`
Expand Down
2 changes: 1 addition & 1 deletion stack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ if is_service_enabled horizon; then
fi

if is_service_enabled q-agt; then
if [[ "$Q_PLUGIN" = "openvswitch" || "$Q_PLUGIN" = "ryu" ]]; then
if [[ "$Q_PLUGIN" = "openvswitch" || "$Q_PLUGIN" = "ryu" || "$Q_PLUGIN" = "janus" ]]; then
# Install deps
# FIXME add to files/apts/quantum, but don't install if not needed!
if [[ "$os_PACKAGE" = "deb" ]]; then
Expand Down