Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

baremetal: rename os_image to bootstrap_os_image #2044

Merged
merged 1 commit into from
Jul 21, 2019

Conversation

markmc
Copy link
Contributor

@markmc markmc commented Jul 18, 2019

Rename the terraform os_image variable to bootstrap_os_image to make it clear that this boot image is only used for the bootstrap VM.

Related to #2037

Unlike other platforms, the baremetal platform uses a different RHCOS
boot image for the bootstrap VM (i.e. a qcow image with libvirt) than
for all other nodes (i.e. an Ironic-deployed image).

Rename the terraform os_image variable to bootstrap_os_image to make
it clear that this boot image is only used for the bootstrap VM.
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 18, 2019
@cgwalters
Copy link
Member

/approve

Copy link
Member

@russellb russellb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2019
@hardys
Copy link

hardys commented Jul 19, 2019

/lgtm

@abhinavdahiya
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, cgwalters, hardys, markmc, russellb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 19, 2019
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

@markmc: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 f47c9ad link /test e2e-aws-scaleup-rhel7

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit e597acb into openshift:master Jul 21, 2019
stbenjam pushed a commit to hardys/installer that referenced this pull request Jul 29, 2019
For the baremetal platform we require two different bootimages,
the QEMU one for the libvirt based bootstrap VM, and the OpenStack
one that contains the necessary Ironic config drive support to pass
data to ignition.

So we rework the Image abstraction by adding a new BootstrapImage
type/asset, which returns the same as Image in all cases except for
the baremetal platform.

This also aligns with the tfvars renamed in openshift#2044 and allows us to
pass the rhcos.QEMU image via BootstrapImage to terraform but leaves
the OpenStack image URL available for future use to deploy masters
via follow-up PRs that implement issue openshift#2060 and also correctly set
the worker machineset providerSpec for the baremetal-operator.

Related: openshift#2037
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants