Skip to content

Commit 4e63278

Browse files
author
Sriram S
committed
Fixed all the scripts to use detected node type
1 parent 244b22d commit 4e63278

3 files changed

Lines changed: 12 additions & 11 deletions

File tree

‎configure.sh‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
1-
node_type=`bash $(dirname $0)/detect-nodetype.sh`
1+
dir_path=$(dirname $0)
2+
node_type=`bash $dir_path/util/detect-nodetype.sh`
23
echo "Node Type detected as: $node_type"
34

45
if [ "$node_type" == "allinone" ]
56
then
67
echo "Configuring packages for All-in-one"
78
sleep 5
8-
bash lib/configure-packages.sh controller
9-
bash lib/configure-packages.sh networknode
10-
bash lib/configure-packages.sh compute
9+
bash $dir_path/lib/configure-packages.sh controller
10+
bash $dir_path/lib/configure-packages.sh networknode
11+
bash $dir_path/lib/configure-packages.sh compute
1112
elif [ "$node_type" == "controller" ] || [ "$node_type" == "compute" ] || [ "$node_type" == "networknode" ]
1213
then
1314
echo "Configuring packages for: "$node_type
1415
sleep 5
15-
bash lib/configure-packages.sh $node_type
16+
bash $dir_path/lib/configure-packages.sh $node_type
1617
elif [ "$node_type" == "controller_networknode" ]
1718
then
1819
echo "Configuring packages for Controller and Network Node"
1920
sleep 5
20-
bash lib/configure-packages.sh controller
21-
bash lib/configure-packages.sh networknode
21+
bash $dir_path/lib/configure-packages.sh controller
22+
bash $dir_path/lib/configure-packages.sh networknode
2223
else
2324
echo "Unsupported Node Type for $0: $node_type"
2425
exit 1;

‎remove.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function remove-networknode-packages() {
3030
}
3131

3232

33-
node_type=`bash $(dirname $0)/detect-nodetype.sh`
33+
node_type=`bash $(dirname $0)/util/detect-nodetype.sh`
3434
echo "Node Type detected as: $node_type"
3535
sleep 5
3636
case $node_type in

‎util/install-config-linux-bridge.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ fi
3131

3232
echo "Setting Linux Bridge drivers for other Agents"
3333
sleep 3
34-
crudini --set /etc/neutron/dchp_agent.ini interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver
34+
crudini --set /etc/neutron/dhcp_agent.ini interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver
3535
crudini --set /etc/neutron/l3_agent.ini interface_driver neutron.agent.linux.interface.BridgeInterfaceDriver
3636

3737
sleep 3
3838
service neutron-server restart
3939
sleep 3
4040
service neutron-plugin-linuxbridge-agent restart
4141
sleep 3
42-
service neutron-plugin-dhcp-agent restart
42+
service neutron-dhcp-agent restart
4343
sleep 3
44-
service neutron-plugin-l3-agent restart
44+
service neutron-l3-agent restart

0 commit comments

Comments
 (0)