summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
b40c620)
Exporting NUM_WORKERS creates additional worker VMs, but prior to this
fix only the first worker was provisioned by the BPA operator.
Signed-off-by: Todd Malsbary <todd.malsbary@intel.com>
Change-Id: I1f8f56a26e6a94b3c6788b08f545b5f1c1713300
set -eu -o pipefail
CLUSTER_NAME=cluster-test
set -eu -o pipefail
CLUSTER_NAME=cluster-test
-
-# Get MAC and IP addresses of VMs provisioned by metal3
-master0=$(virsh net-dhcp-leases baremetal |grep master-0)
-masterMAC=$(echo $master0 | cut -d " " -f 3)
-masterIP=$(echo $master0 | cut -d " " -f 5)
-masterIP="${masterIP%%/*}"
-
-worker0=$(virsh net-dhcp-leases baremetal |grep worker-0)
-workerMAC=$(echo $worker0 | cut -d " " -f 3)
-workerIP=$(echo $worker0 | cut -d " " -f 5)
-workerIP="${workerIP%%/*}"
+NUM_MASTERS=${NUM_MASTERS:-"1"}
+NUM_WORKERS=${NUM_WORKERS:-"1"}
# Create Fake DHCP File
mkdir -p /opt/icn/dhcp
# Create Fake DHCP File
mkdir -p /opt/icn/dhcp
# authoring-byte-order entry is generated, DO NOT DELETE
authoring-byte-order little-endian;
# authoring-byte-order entry is generated, DO NOT DELETE
authoring-byte-order little-endian;
+EOF
+for ((master=0;master<NUM_MASTERS;++master)); do
+ lease=$(virsh net-dhcp-leases baremetal |grep "master-${master}")
+ mac=$(echo $lease | cut -d " " -f 3)
+ ip=$(echo $lease | cut -d " " -f 5)
+ ip="${ip%%/*}"
+ cat <<EOF >> /opt/icn/dhcp/dhcpd.leases
+lease ${ip} {
starts 4 2019/08/08 22:32:49;
ends 4 2019/08/08 23:52:49;
cltt 4 2019/08/08 22:32:49;
binding state active;
next binding state free;
rewind binding state free;
starts 4 2019/08/08 22:32:49;
ends 4 2019/08/08 23:52:49;
cltt 4 2019/08/08 22:32:49;
binding state active;
next binding state free;
rewind binding state free;
- hardware ethernet ${masterMAC};
- client-hostname "master-0";
+ hardware ethernet ${mac};
+ client-hostname "master-${master}";
+EOF
+done
+for ((worker=0;worker<NUM_WORKERS;++worker)); do
+ lease=$(virsh net-dhcp-leases baremetal |grep "worker-${worker}")
+ mac=$(echo $lease | cut -d " " -f 3)
+ ip=$(echo $lease | cut -d " " -f 5)
+ ip="${ip%%/*}"
+ cat <<EOF >> /opt/icn/dhcp/dhcpd.leases
+lease ${ip} {
starts 4 2019/08/08 22:32:49;
ends 4 2019/08/08 23:52:49;
cltt 4 2019/08/08 22:32:49;
binding state active;
next binding state free;
rewind binding state free;
starts 4 2019/08/08 22:32:49;
ends 4 2019/08/08 23:52:49;
cltt 4 2019/08/08 22:32:49;
binding state active;
next binding state free;
rewind binding state free;
- hardware ethernet ${workerMAC};
- client-hostname "worker-0";
+ hardware ethernet ${mac};
+ client-hostname "worker-${worker}";
# Create provisioning CR file for testing
cat <<EOF > e2etest/e2e_test_provisioning_cr.yaml
# Create provisioning CR file for testing
cat <<EOF > e2etest/e2e_test_provisioning_cr.yaml
- - master-0:
- mac-address: ${masterMAC}
+EOF
+for ((master=0;master<NUM_MASTERS;++master)); do
+ lease=$(virsh net-dhcp-leases baremetal |grep "master-${master}")
+ mac=$(echo $lease | cut -d " " -f 3)
+ cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
+ - master-${master}:
+ mac-address: ${mac}
+EOF
+done
+cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
- - worker-0:
- mac-address: ${workerMAC}
+EOF
+for ((worker=0;worker<NUM_WORKERS;++worker)); do
+ lease=$(virsh net-dhcp-leases baremetal |grep "worker-${worker}")
+ mac=$(echo $lease | cut -d " " -f 3)
+ cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
+ - worker-${worker}:
+ mac-address: ${mac}
+EOF
+done
+cat <<EOF >> e2etest/e2e_test_provisioning_cr.yaml
!config_example.sh
master-*.json
worker-*.json
!config_example.sh
master-*.json
worker-*.json
+master-*.yaml
+worker-*.yaml
# documentation for the values below may be found at
# https://cloudinit.readthedocs.io/en/latest/topics/modules.html
# documentation for the values below may be found at
# https://cloudinit.readthedocs.io/en/latest/topics/modules.html
+function create_userdata {
name="$1"
COMPUTE_NODE_FQDN="$name.akraino.icn.org"
printf "#cloud-config\n" > $name-userdata.yaml
name="$1"
COMPUTE_NODE_FQDN="$name.akraino.icn.org"
printf "#cloud-config\n" > $name-userdata.yaml
printf "\n" >> $name-userdata.yaml
}
printf "\n" >> $name-userdata.yaml
}
-apply_userdata_credential() {
+function apply_userdata_credential {
name="$1"
cat <<EOF > ./$name-user-data-credential.yaml
apiVersion: v1
name="$1"
cat <<EOF > ./$name-user-data-credential.yaml
apiVersion: v1
kubectl apply -n metal3 -f $name-user-data-credential.yaml
}
kubectl apply -n metal3 -f $name-user-data-credential.yaml
}
+function create_networkdata {
name="$1"
node_networkdata $name > $name-networkdata.json
}
name="$1"
node_networkdata $name > $name-networkdata.json
}
-apply_networkdata_credential() {
+function apply_networkdata_credential {
name="$1"
cat <<EOF > ./$name-network-data-credential.yaml
apiVersion: v1
name="$1"
cat <<EOF > ./$name-network-data-credential.yaml
apiVersion: v1