Skip to content

Commit 425b3dd

Browse files
committed
Fix for datadeployment set for update DataPlaneDeployment
Dataplane nodesets list is not the same for ovn update and regular update stage in some topologies. Fix in [1] added back missing variable, but correct approach is to use variable with all existing nodesets. [1]#1056
1 parent fa1ad6c commit 425b3dd

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

scripts/openstack-update.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ while read -r node_name services; do
131131
done <<< $openstackdataplanenodesets
132132

133133
DATAPLANE_DEPLOYMENT=edpm
134-
NODE_SETS=$(printf ' %s\n' "${nodes_with_ovn[@]}")
134+
OVN_NODE_SETS=$(printf ' %s\n' "${nodes_with_ovn[@]}")
135135

136136
cat <<EOF >edpm-deployment-ovn-update.yaml
137137
apiVersion: dataplane.openstack.org/v1beta1
@@ -140,7 +140,7 @@ metadata:
140140
name: $DATAPLANE_DEPLOYMENT-ovn-update
141141
spec:
142142
nodeSets:
143-
$NODE_SETS
143+
$OVN_NODE_SETS
144144
servicesOverride:
145145
- ovn
146146
EOF
@@ -161,14 +161,16 @@ echo "MinorUpdateControlplane completed"
161161
get_current_state "04_after_controlplane_update"
162162

163163
# start data plane plane update for rest of edpm services
164+
DATAPLANE_NODESETS=$(oc get openstackdataplanenodeset -o name | awk -F'/' '{print " - " $2}')
165+
164166
cat <<EOF >edpm-deployment-update.yaml
165167
apiVersion: dataplane.openstack.org/v1beta1
166168
kind: OpenStackDataPlaneDeployment
167169
metadata:
168170
name: $DATAPLANE_DEPLOYMENT-update
169171
spec:
170172
nodeSets:
171-
$NODE_SETS
173+
$DATAPLANE_NODESETS
172174
servicesOverride:
173175
- update
174176
EOF

0 commit comments

Comments
 (0)