Skip to content

Commit 740e86e

Browse files
committed
Moved function from configure-rdo.sh to utils.sh
When trying to run configure-rdo.sh, I received an error "config_openstack_network_adapter not found". So I moved the function from configure-rdo.sh to utils.sh and the problem is now solved. It works both on Havana and Icehouse
1 parent d7224cd commit 740e86e

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

configure-rdo.sh

-14
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,6 @@ if [ -n "$HYPERV_COMPUTE_VM_IP" ]; then
6262
exec_with_retry "$BASEDIR/rename-windows-host.sh $HYPERV_COMPUTE_VM_IP $HYPERV_ADMIN $HYPERV_PASSWORD $HYPERV_COMPUTE_VM_NAME" 30 30
6363
fi
6464

65-
config_openstack_network_adapter () {
66-
SSHUSER_HOST=$1
67-
ADAPTER=$2
68-
69-
run_ssh_cmd_with_retry $SSHUSER_HOST "cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$ADAPTER
70-
DEVICE="$ADAPTER"
71-
BOOTPROTO="none"
72-
MTU="1500"
73-
ONBOOT="yes"
74-
EOF"
75-
76-
run_ssh_cmd_with_retry $SSHUSER_HOST "ifup $ADAPTER"
77-
}
78-
7965
echo "Configuring networking"
8066

8167
set_hostname $RDO_ADMIN@$CONTROLLER_VM_IP $CONTROLLER_VM_NAME.$DOMAIN $CONTROLLER_VM_IP

utils.sh

+14
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ exec_with_retry2 () {
2020
return $EXIT
2121
}
2222

23+
config_openstack_network_adapter () {
24+
SSHUSER_HOST=$1
25+
ADAPTER=$2
26+
27+
run_ssh_cmd_with_retry $SSHUSER_HOST "cat << EOF > /etc/sysconfig/network-scripts/ifcfg-$ADAPTER
28+
DEVICE="$ADAPTER"
29+
BOOTPROTO="none"
30+
MTU="1500"
31+
ONBOOT="yes"
32+
EOF"
33+
34+
run_ssh_cmd_with_retry $SSHUSER_HOST "ifup $ADAPTER"
35+
}
36+
2337
exec_with_retry () {
2438
CMD=$1
2539
MAX_RETRIES=${2-10}

0 commit comments

Comments
 (0)