Skip to content

Commit

Permalink
Merge pull request #870 from Akrog/fix-cinder-volume-changes
Browse files Browse the repository at this point in the history
Cinder: Fix `cinderVolumes` changes
  • Loading branch information
openshift-merge-bot[bot] authored Jun 20, 2024
2 parents ce706ee + ede5a06 commit b3e6fe6
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkg/openstack/cinder.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,8 @@ func ReconcileCinder(ctx context.Context, instance *corev1beta1.OpenStackControl
return errors.New("default Cinder Volume images is unset")
}

if cinder.Spec.CinderVolumes == nil {
cinder.Spec.CinderVolumes = make(map[string]cinderv1.CinderVolumeTemplate)
}
// Discard old list of volume services and rebuild it
cinder.Spec.CinderVolumes = make(map[string]cinderv1.CinderVolumeTemplate)

for name, volume := range instance.Spec.Cinder.Template.CinderVolumes {
cinderCore := cinderv1.CinderVolumeTemplate{}
Expand Down

0 comments on commit b3e6fe6

Please sign in to comment.