diff --git a/Gopkg.lock b/Gopkg.lock index dd4d452f91..9a2d3d4739 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -346,14 +346,14 @@ [[projects]] branch = "master" - digest = "1:e1397de7eda15e425e712b890b41d22cc1c96610ba7dceb1074bd54667d635f7" + digest = "1:c2802eed24ed1b44737118fc3c8c88897648202896733da870fd943d87a55fa0" name = "github.com/openshift/installer" packages = [ "pkg/ipnet", "pkg/types", ] pruneopts = "NUT" - revision = "ae20cf6ddc6872c79600a3342598ff61bf4925fd" + revision = "533c4e581af380166680a0df7241728b9342f711" [[projects]] digest = "1:f7646c654e93258958dba300641f8f674d5a9ed015c11119793ba1156e2acbe9" diff --git a/pkg/operator/render_test.go b/pkg/operator/render_test.go index 0212e76af9..9f70ed225c 100644 --- a/pkg/operator/render_test.go +++ b/pkg/operator/render_test.go @@ -49,12 +49,12 @@ baseDomain: tt.testing clusterID: 2d149e46-90ee-3436-018a-1b02f6864006 machines: - name: master - platformConfig: + platform: libvirt: qcowImagePath: /path/rhcos-qemu.qcow2 replicas: 1 - name: worker - platformConfig: + platform: libvirt: qcowImagePath: /path/rhcos-qemu.qcow2 replicas: 2 diff --git a/vendor/github.com/openshift/installer/pkg/types/machinepools.go b/vendor/github.com/openshift/installer/pkg/types/machinepools.go index 45e5da791c..59b14181cf 100644 --- a/vendor/github.com/openshift/installer/pkg/types/machinepools.go +++ b/vendor/github.com/openshift/installer/pkg/types/machinepools.go @@ -9,22 +9,22 @@ type MachinePool struct { // Default is 1. Replicas *int64 `json:"replicas"` - // PlatformConfig is configuration for machine pool specific to the platfrom. - PlatformConfig MachinePoolPlatformConfig `json:"platformConfig"` + // Platform is configuration for machine pool specific to the platfrom. + Platform MachinePoolPlatform `json:"platform"` } -// MachinePoolPlatformConfig is the platform-specific configuration for a machine +// MachinePoolPlatform is the platform-specific configuration for a machine // pool. Only one of the platforms should be set. -type MachinePoolPlatformConfig struct { +type MachinePoolPlatform struct { // AWS is the configuration used when installing on AWS. - AWS *AWSMachinePoolPlatformConfig `json:"aws,omitempty"` + AWS *AWSMachinePoolPlatform `json:"aws,omitempty"` // Libvirt is the configuration used when installing on libvirt. - Libvirt *LibvirtMachinePoolPlatformConfig `json:"libvirt,omitempty"` + Libvirt *LibvirtMachinePoolPlatform `json:"libvirt,omitempty"` } -// AWSMachinePoolPlatformConfig stores the configuration for a machine pool +// AWSMachinePoolPlatform stores the configuration for a machine pool // installed on AWS. -type AWSMachinePoolPlatformConfig struct { +type AWSMachinePoolPlatform struct { // InstanceType defines the ec2 instance type. // eg. m4-large InstanceType string `json:"type"` @@ -47,9 +47,9 @@ type EC2RootVolume struct { Type string `json:"type"` } -// LibvirtMachinePoolPlatformConfig stores the configuration for a machine pool +// LibvirtMachinePoolPlatform stores the configuration for a machine pool // installed on libvirt. -type LibvirtMachinePoolPlatformConfig struct { +type LibvirtMachinePoolPlatform struct { // QCOWImagePath QCOWImagePath string `json:"qcowImagePath"` }