Skip to content

Commit

Permalink
Bug 1821151: oVirt, add os_type to ovirt templates
Browse files Browse the repository at this point in the history
On RHV 4.3.9 we have change the ignition handling and API,
to recognize an ignition is passed to the VM we need to specify the os_type as RHCOS.
During the installation the installer creates a ovirt templates to be used by the nodes,
so we need to create the template with os_type = "rchos".

Signed-off-by: Gal Zaidman <gzaidman@redhat.com>
  • Loading branch information
Gal Zaidman committed Apr 7, 2020
1 parent bf4f811 commit d841fba
Show file tree
Hide file tree
Showing 6 changed files with 353 additions and 39 deletions.
3 changes: 3 additions & 0 deletions data/data/ovirt/template/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ resource "ovirt_vm" "tmp_import_vm" {
disk_id = ovirt_image_transfer.releaseimage.0.disk_id
interface = "virtio_scsi"
}
os {
type = "rhcos_x86"
}
nics {
name = "nic1"
vnic_profile_id = data.ovirt_vnic_profiles.vnic_profiles.vnic_profiles.0.id
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
github.com/openshift/machine-api-operator v0.2.1-0.20200310180732-c63fa2b143f0
github.com/openshift/machine-config-operator v4.2.0-alpha.0.0.20190917115525-033375cbe820+incompatible
github.com/ovirt/go-ovirt v4.3.4+incompatible
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200122105935-65b89ad00553
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200406133650-74a154c1d861
github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db // indirect
github.com/pborman/uuid v1.2.0
github.com/pierrec/lz4 v2.3.0+incompatible // indirect
Expand Down
7 changes: 3 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1788,8 +1788,6 @@ github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200120152131-1b09fd9e71
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200120152131-1b09fd9e7156/go.mod h1:KCyjaBfEkifs9bqV1HEXDJUyQylgeLSqiqt2QnMn7is=
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603 h1:MC6BSZYxFPoqqKj9PdlGjHGVKcMsvn6Kv1NiVzQErZ8=
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603/go.mod h1:7pQ9Bzha+ug/5zd+0ufbDEcnn2OnNlPwRwYrzhXk4NM=
github.com/openshift/cluster-api-provider-openstack v0.0.0-20200130125124-ef82ce374112 h1:ny9quEJfUBkUyalPn4sRBX86Ci5Jx72pIO2Qjsxy0yA=
github.com/openshift/cluster-api-provider-openstack v0.0.0-20200130125124-ef82ce374112/go.mod h1:ntMRKZlv++TExGO4g2jgsVIaHKJt8kKe72BAvMPV5vA=
github.com/openshift/cluster-api-provider-openstack v0.0.0-20200221124403-d699c3611b0c h1:Rn/Ip2nbWUhvOF9/EZaorxKVcQnm427cSOJQJIFXuHQ=
github.com/openshift/cluster-api-provider-openstack v0.0.0-20200221124403-d699c3611b0c/go.mod h1:ntMRKZlv++TExGO4g2jgsVIaHKJt8kKe72BAvMPV5vA=
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20200128081049-840376ca5c09 h1:QJxGgIB7f5BqNPEZOCgV29NsDf1P439Bs3q0B5O3fP8=
Expand Down Expand Up @@ -1826,10 +1824,11 @@ github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b/
github.com/oracle/oci-go-sdk v7.0.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
github.com/ostreedev/ostree-go v0.0.0-20190702140239-759a8c1ac913/go.mod h1:J6OG6YJVEWopen4avK3VNQSnALmmjvniMmni/YFYAwc=
github.com/ovirt/go-ovirt v0.0.0-20200313072907-d30f754823a6/go.mod h1:fLDxPk1Sf64DBYtwIYxrnx3gPZ1q0xPdWdI1y9vxUaw=
github.com/ovirt/go-ovirt v4.3.4+incompatible h1:jXcJpcXyNZ3mXJ1IVU3l3tMpE4JEUSNjqRiEJnVpG40=
github.com/ovirt/go-ovirt v4.3.4+incompatible/go.mod h1:r33ZGjVKCPMiI6hw791/Zx8tNKk0Gn+4VFWbOfyIvZQ=
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200122105935-65b89ad00553 h1:vmWD1P79PygdRMQluGsJ1Xl7PIIcJiiL8ZnawfUTv24=
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200122105935-65b89ad00553/go.mod h1:IJf1C8MY1f4djN506HESURNfvcjrMVjBWEHN13dw8R0=
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200406133650-74a154c1d861 h1:vhOqmT4WRzfUys+NBhTzkRD08waA3dNDB7G5Pty2Rns=
github.com/ovirt/terraform-provider-ovirt v0.4.3-0.20200406133650-74a154c1d861/go.mod h1:XFDLN/srNA1s2Dq+gp4zBvql6nRnfNJzDGzI5vtK85g=
github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0=
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
github.com/packer-community/winrmcp v0.0.0-20180102160824-81144009af58/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d841fba

Please sign in to comment.