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.

Sign up for GitHub

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

Jump to bottom

Bug 1808456: OpenStack: allow to overwrite default os image in the install config #3170

Merged
merged 2 commits into from Feb 26, 2020
Merged

Bug 1808456: OpenStack: allow to overwrite default os image in the install config #3170

merged 2 commits into from Feb 26, 2020

Conversation

Fedosin
Copy link
Contributor

@Fedosin Fedosin commented Feb 24, 2020

This PR adds clusterOSImage parameter to the install config, that allows to override default OS image location for users.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 24, 2020
@sdodson
Copy link
Member

sdodson commented Feb 24, 2020

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sdodson

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 Feb 24, 2020
@adduarte
Copy link

/test e2e-libvirt

pierreprinetti
pierreprinetti reviewed Feb 25, 2020
View reviewed changes
docs/user/openstack/customization.md Outdated

**NOTE:** For this to work, the parameter value must be a valid http(s) URL.

**NOTE:** The optional `sha256` query parameter can be attach to the URL, which will force the installer to check the image file checksum before uploading it into Glance.
Copy link
Member

Choose a reason for hiding this comment

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

s/attach/attached/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

docs/user/openstack/customization.md Outdated
@@ -90,6 +91,37 @@ pullSecret: '{"auths": ...}'
sshKey: ssh-ed25519 AAAA...
```

## Image Overrides

When doing a disconnected installation, the OpenStack platform has the additional requirement that we have locations to download the RHCOS images. The installer downloads these from a location described in
Copy link
Member

Choose a reason for hiding this comment

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

When doing a disconnected installation

strictly speaking, that requirement is always present, and not only for disconnected installs.

What about something like:

The installer downloads the RHCOS image from a predetermined location (cf [data/data/rhcos.json](/data/data/rhcos.json)). The download URL can be overridden, notably for disconnected installations.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

docs/user/openstack/customization.md Outdated
clusterOSImage: my-rhcos
```

**NOTE:** The only difference in behavior with the previous example is that the value here is not an http(s) URL.
Copy link
Member

Choose a reason for hiding this comment

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

It's not the only difference! The sha256 checksum is missing as well. I'd say instead:

If `clusterOSImage` is not an URL, then the installer will look into Glance for an image with that name.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@sdodson sdodson mentioned this pull request Feb 25, 2020
Merged
@pierreprinetti
Copy link
Member

/lgtm

🎉

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 26, 2020
@pierreprinetti
Copy link
Member

/hold
/test e2e-openstack

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2020
@pierreprinetti
Copy link
Member

/retest

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 26, 2020 •
edited

@Fedosin: The following tests failed, say /retest to rerun all failed tests:

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

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.

@pierreprinetti
Copy link
Member

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2020
@openshift-merge-robot openshift-merge-robot merged commit d2490ec into openshift:master Feb 26, 2020
@Fedosin Fedosin changed the title OpenStack: allow to overwrite default os image in the install config Bug 1808456: OpenStack: allow to overwrite default os image in the install config Feb 28, 2020
@openshift-ci-robot
Copy link
Contributor

@Fedosin: All pull requests linked via external trackers have merged. Bugzilla bug 1808456 has been moved to the MODIFIED state.

In response to this:

Bug 1808456: OpenStack: allow to overwrite default os image in the install config

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.

@Fedosin
Copy link
Contributor Author

Fedosin commented Feb 28, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot
Copy link

@Fedosin: #3170 failed to apply on top of branch "release-4.3":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/asset/rhcos/image.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/asset/rhcos/image.go
CONFLICT (content): Merge conflict in pkg/asset/rhcos/image.go
Patch failed at 0001 OpenStack: allow to overwrite default os image in the install config

In response to this:

/cherry-pick release-4.3

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.

@Fedosin
Copy link
Contributor Author

Fedosin commented Feb 28, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 28, 2020
Merged
@openshift-cherrypick-robot
Copy link

@Fedosin: new pull request created: #3205

In response to this:

/cherry-pick release-4.4

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pierreprinetti pierreprinetti pierreprinetti left review comments

@jcpowermac jcpowermac Awaiting requested review from jcpowermac

@jhixson74 jhixson74 Awaiting requested review from jhixson74

Assignees

@pierreprinetti pierreprinetti

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@Fedosin @sdodson @openshift-ci-robot @adduarte @pierreprinetti @openshift-cherrypick-robot @openshift-merge-robot