Skip to content

Fix minor installer issues #147

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
nasim-techtrueup wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix minor installer issues #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36f685f
Fix minor installer issues
nasim-techtrueup Jun 27, 2017
53b9619
Fix devstack installation for public net
nasim-techtrueup Jul 7, 2017
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
3 changes: 2 additions & 1 deletion contrail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,6 +1053,7 @@ function start_contrail() {

screen_it zk "cd $CONTRAIL_SRC/third_party/zookeeper-${ZK_VER}; ./bin/zkServer.sh start"

sleep 4
screen_it kafka "sudo /usr/share/kafka/bin/kafka-server-start.sh /usr/share/kafka/config/server.properties"

if [[ "$CONTRAIL_DEFAULT_INSTALL" != "True" ]]; then
Expand All @@ -1064,7 +1065,7 @@ function start_contrail() {
else
screen_it ifmap "cd /usr/share/ifmap-server; sudo java -jar ./irond.jar"
fi
sleep 2
sleep 4

RABBIT_OPTS="--rabbit_user ${RABBIT_USER} --rabbit_password ${RABBIT_PASSWORD} --rabbit_server ${RABBIT_IP}"

Expand Down
4 changes: 2 additions & 2 deletions contrail_config_functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,9 +752,9 @@ function replace_contrail_vrouter_agent_conf()
gateway=$(find_gateway $PHYSICAL_INTERFACE)

if [ $USE_DISCOVERY = "False" ]; then
check_replace_value $file CONTROL-NODE server $CFGM_IP
check_replace_value $file CONTROL-NODE servers $CFGM_IP
else
inicomment $file CONTROL-NODE server
inicomment $file CONTROL-NODE servers
fi
check_replace_value $file NETWORKS control_network_ip $CFGM_IP
check_replace_value $file VIRTUAL-HOST-INTERFACE ip $cidr
Expand Down
6 changes: 6 additions & 0 deletions devstack/samples/localrc-all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,9 @@ GIT_BASE=https://git.openstack.org
# NOVA_VIF_DRIVER=nova_contrail_vif.contrailvif.VRouterVIFDriver

Q_PLUGIN_CLASS=neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2

# Avoid using default provider net for public access, contrail expects
# vlan/segmentation id to be avaiable for it to work and default devstack try
# creating public network without any id association, resulting in devstack
# installation failure
Q_USE_PROVIDERNET_FOR_PUBLIC=False