Skip to content

Commit 73ce2ef

Browse files
iranzoiranzo
authored
Merge pull request #414 from iranzo/indexremoval
2 parents 39fb164 + 260d738 commit 73ce2ef

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

‎deploy-edgecluster/render_edgeclusters.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -258,15 +258,15 @@ EOF
258258
# Now process blocks for each master
259259
for master in $(echo $(seq 0 $(($(yq eval ".edgeclusters[${edgeclusternumber}].[]|keys" ${EDGECLUSTERS_FILE} | grep master | wc -l) - 1)))); do
260260
# Master loop
261-
export CHANGE_EDGE_MASTER_PUB_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.nic_int_static" ${EDGECLUSTERS_FILE})
262-
export CHANGE_EDGE_MASTER_MGMT_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.nic_ext_dhcp" ${EDGECLUSTERS_FILE})
261+
export CHANGE_EDGE_MASTER_PUB_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.nic_int_static" ${EDGECLUSTERS_FILE})
262+
export CHANGE_EDGE_MASTER_MGMT_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.nic_ext_dhcp" ${EDGECLUSTERS_FILE})
263263
export CHANGE_EDGE_MASTER_PUB_INT_IP=192.168.7.1${master}
264-
export CHANGE_EDGE_MASTER_PUB_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.mac_int_static" ${EDGECLUSTERS_FILE})
265-
export CHANGE_EDGE_MASTER_BMC_USERNAME=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.bmc_user" ${EDGECLUSTERS_FILE} | base64)
266-
export CHANGE_EDGE_MASTER_BMC_PASSWORD=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.bmc_pass" ${EDGECLUSTERS_FILE} | base64)
267-
export CHANGE_EDGE_MASTER_BMC_URL=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.bmc_url" ${EDGECLUSTERS_FILE})
268-
export CHANGE_EDGE_MASTER_MGMT_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
269-
export CHANGE_EDGE_MASTER_ROOT_DISK=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.master${master}.root_disk" ${EDGECLUSTERS_FILE})
264+
export CHANGE_EDGE_MASTER_PUB_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.mac_int_static" ${EDGECLUSTERS_FILE})
265+
export CHANGE_EDGE_MASTER_BMC_USERNAME=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.bmc_user" ${EDGECLUSTERS_FILE} | base64)
266+
export CHANGE_EDGE_MASTER_BMC_PASSWORD=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.bmc_pass" ${EDGECLUSTERS_FILE} | base64)
267+
export CHANGE_EDGE_MASTER_BMC_URL=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.bmc_url" ${EDGECLUSTERS_FILE})
268+
export CHANGE_EDGE_MASTER_MGMT_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
269+
export CHANGE_EDGE_MASTER_ROOT_DISK=$(yq eval ".edgeclusters[${edgeclusternumber}].[].master${master}.root_disk" ${EDGECLUSTERS_FILE})
270270

271271
# Now, write the template to disk
272272
OUTPUT="${OUTPUTDIR}/${cluster}-master-${master}.yaml"

‎deploy-worker/render_worker.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ create_worker_definitions() {
2727
NUM_W=$((NUM_W - 1))
2828

2929
for worker in $(seq 0 ${NUM_W}); do
30-
export CHANGE_EDGE_WORKER_PUB_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.nic_int_static" ${EDGECLUSTERS_FILE})
31-
export CHANGE_EDGE_WORKER_MGMT_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.nic_ext_dhcp" ${EDGECLUSTERS_FILE})
30+
export CHANGE_EDGE_WORKER_PUB_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.nic_int_static" ${EDGECLUSTERS_FILE})
31+
export CHANGE_EDGE_WORKER_MGMT_INT=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.nic_ext_dhcp" ${EDGECLUSTERS_FILE})
3232
export CHANGE_EDGE_WORKER_PUB_INT_IP=192.168.7.13
3333
export EDGE_MASTER_0_INT_IP=192.168.7.10
34-
export CHANGE_EDGE_WORKER_PUB_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.mac_int_static" ${EDGECLUSTERS_FILE})
35-
export CHANGE_EDGE_WORKER_BMC_USERNAME=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.bmc_user" ${EDGECLUSTERS_FILE} | base64)
36-
export CHANGE_EDGE_WORKER_BMC_PASSWORD=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.bmc_pass" ${EDGECLUSTERS_FILE} | base64)
37-
export CHANGE_EDGE_WORKER_BMC_URL=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.bmc_url" ${EDGECLUSTERS_FILE})
38-
export CHANGE_EDGE_WORKER_MGMT_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
39-
export CHANGE_EDGE_WORKER_ROOT_DISK=$(yq eval ".edgeclusters[${edgeclusternumber}].${cluster}.worker${worker}.root_disk" ${EDGECLUSTERS_FILE})
34+
export CHANGE_EDGE_WORKER_PUB_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.mac_int_static" ${EDGECLUSTERS_FILE})
35+
export CHANGE_EDGE_WORKER_BMC_USERNAME=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.bmc_user" ${EDGECLUSTERS_FILE} | base64)
36+
export CHANGE_EDGE_WORKER_BMC_PASSWORD=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.bmc_pass" ${EDGECLUSTERS_FILE} | base64)
37+
export CHANGE_EDGE_WORKER_BMC_URL=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.bmc_url" ${EDGECLUSTERS_FILE})
38+
export CHANGE_EDGE_WORKER_MGMT_INT_MAC=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
39+
export CHANGE_EDGE_WORKER_ROOT_DISK=$(yq eval ".edgeclusters[${edgeclusternumber}].[].worker${worker}.root_disk" ${EDGECLUSTERS_FILE})
4040

4141
# Now, write the template to disk
4242
OUTPUT="${OUTPUTDIR}/${cluster}-worker${worker}.yaml"

‎finish-deployment/deploy.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function save_files() {
9191
echo
9292
EDGE_NODE_NAME=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent -n ${cluster} ${agent} -o jsonpath={.spec.hostname})
9393
master=${EDGE_NODE_NAME##*-}
94-
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].${cluster}.master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
94+
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].[].master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
9595
EDGE_NODE_IP_RAW=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent ${agent} -n ${cluster} --no-headers -o jsonpath="{.status.inventory.interfaces[?(@.macAddress==\"${MAC_EXT_DHCP%%/*}\")].ipV4Addresses[0]}")
9696
NODE_IP=${EDGE_NODE_IP_RAW%%/*}
9797
if [[ -n ${NODE_IP} ]]; then

‎shared-utils/common.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function trust_node_certificates() {
8989
echo
9090
EDGE_NODE_NAME=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent -n ${cluster} ${agent} -o jsonpath={.spec.hostname})
9191
master=${EDGE_NODE_NAME##*-}
92-
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].${cluster}.master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
92+
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].[].master${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
9393
EDGE_NODE_IP_RAW=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent ${agent} -n ${cluster} --no-headers -o jsonpath="{.status.inventory.interfaces[?(@.macAddress==\"${MAC_EXT_DHCP%%/*}\")].ipV4Addresses[0]}")
9494
NODE_IP=${EDGE_NODE_IP_RAW%%/*}
9595
if [[ -n ${NODE_IP} ]]; then
@@ -111,7 +111,7 @@ function trust_node_certificates() {
111111
echo
112112
EDGE_NODE_NAME=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent -n ${cluster} ${agent} -o jsonpath={.spec.hostname})
113113
worker=${EDGE_NODE_NAME##*-}
114-
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].${cluster}.worker${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
114+
MAC_EXT_DHCP=$(yq e ".edgeclusters[${i}].[].worker${master}.mac_ext_dhcp" ${EDGECLUSTERS_FILE})
115115
EDGE_NODE_IP_RAW=$(oc --kubeconfig=${KUBECONFIG_HUB} get agent ${agent} -n ${cluster} --no-headers -o jsonpath="{.status.inventory.interfaces[?(@.macAddress==\"${MAC_EXT_DHCP%%/*}\")].ipV4Addresses[0]}")
116116
NODE_IP=${EDGE_NODE_IP_RAW%%/*}
117117
if [[ -n ${NODE_IP} ]]; then

0 commit comments

Comments
 (0)