Merge pull request #662 from jichenjc/add_root_volume

k8s-ci-robot · web-flow · commit 2f588c15fc56 · 2020-11-02T16:30:15.000-08:00
Add root volume support (put root volume into instance create param)
diff --git a/pkg/cloud/services/compute/instance.go b/pkg/cloud/services/compute/instance.go
@@ -79,6 +79,7 @@ func (s *Service) InstanceCreate(clusterName string, machine *clusterv1.Machine,
 		Metadata:      openStackMachine.Spec.ServerMetadata,
 		ConfigDrive:   openStackMachine.Spec.ConfigDrive,
 		FailureDomain: *machine.Spec.FailureDomain,
+		RootVolume:    openStackMachine.Spec.RootVolume,
 	}
 
 	if openStackMachine.Spec.Trunk {

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@ func (s Service) InstanceCreate(clusterName string, machine clusterv1.Machine,`
`79`	`79`	`Metadata: openStackMachine.Spec.ServerMetadata,`
`80`	`80`	`ConfigDrive: openStackMachine.Spec.ConfigDrive,`
`81`	`81`	`FailureDomain: *machine.Spec.FailureDomain,`
	`82`	`+ RootVolume: openStackMachine.Spec.RootVolume,`
`82`	`83`	`}`
`83`	`84`
`84`	`85`	`if openStackMachine.Spec.Trunk {`