Update patch set 18

Patch Set 18: Verified-1

This change depends on a change that failed to merge.

Change openstack-k8s-operators/data-plane-adoption#397 is needed.

Patch-set: 18
Reviewer: Gerrit User 499 <499@270e2033-b340-4cff-9539-693957ebf0e7>
Label: Verified=-1, fd134704ea5710c0264857ad2f346c9011fa8e7b
Attention: {"person_ident":"Gerrit User 192 \u003c192@270e2033-b340-4cff-9539-693957ebf0e7\u003e","operation":"ADD","reason":"A robot voted negatively on a label"}