Skip to content

Remove numbered OSP playbook prefixes#23235

Merged
maxwelldb merged 1 commit intoopenshift:masterfrom
maxwelldb:osp-playbook-numbers-21365
Oct 27, 2020
Merged

Remove numbered OSP playbook prefixes#23235
maxwelldb merged 1 commit intoopenshift:masterfrom
maxwelldb:osp-playbook-numbers-21365

Conversation

@maxwelldb
Copy link
Copy Markdown
Contributor

@maxwelldb maxwelldb commented Jun 23, 2020 •
edited
Loading

This PR resolves #21365.

Jira ticket: https://issues.redhat.com/browse/OSDOCS-1572

Any concerns with this, @pierreprinetti?

@maxwelldb maxwelldb added this to the Future Release milestone Jun 23, 2020
@maxwelldb maxwelldb requested a review from pierreprinetti June 23, 2020 18:32
@maxwelldb maxwelldb self-assigned this Jun 23, 2020
@openshift-docs-preview-bot
Copy link
Copy Markdown

openshift-docs-preview-bot commented Jun 23, 2020 •
edited by maxwelldb
Loading

The preview will be available shortly at:

Document preview URL: https://osp-playbook-numbers-21365--ocpdocs.netlify.app/openshift-enterprise/latest/installing/installing_openstack/installing-openstack-user.html

pierreprinetti
pierreprinetti approved these changes Jun 25, 2020
View reviewed changes
Copy link
Copy Markdown

@pierreprinetti pierreprinetti left a comment

Choose a reason for hiding this comment

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

zero concerns 👍

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 25, 2020

Thanks!

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 25, 2020 •
edited
Loading

@wjiangjay or @gpei Would either of you be able to ack this?

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 25, 2020

edit to add @wjiangjay there ^^^. I used your CoreOS Slack name rather than your GH one.

@maxwelldb maxwelldb requested review from a user and gpei July 2, 2020 18:14
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jul 7, 2020 •
edited
Loading

Adding QE requests for a few more OSP folks...

@chao007 @rlobillo @udis Are any of you able to give this a look?

@maxwelldb maxwelldb requested review from a user, chao007, gpei, rlobillo and udis and removed request for a user and gpei July 7, 2020 21:31
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jul 10, 2020

@pierreprinetti Is there anyone in particular you could recommend to QE this?

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Aug 12, 2020

@wjiangjay @gpei @chao007 @rlobillo Anyone able to +1 this?

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 8, 2020
@ghost
Copy link
Copy Markdown

ghost commented Oct 27, 2020

@maxwelldb Sorry for the delay, LGTM

@maxwelldb maxwelldb force-pushed the osp-playbook-numbers-21365 branch 3 times, most recently from 051df3a to 779002b Compare October 27, 2020 13:30
@maxwelldb maxwelldb force-pushed the osp-playbook-numbers-21365 branch from 779002b to 85a9553 Compare October 27, 2020 13:33
@maxwelldb maxwelldb force-pushed the osp-playbook-numbers-21365 branch from 85a9553 to 602a3d7 Compare October 27, 2020 13:39
@maxwelldb maxwelldb force-pushed the osp-playbook-numbers-21365 branch from 602a3d7 to 8ca2251 Compare October 27, 2020 13:56
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020

TODO on cherrypicks: sub in proper release branch URLs for 4.5-4.7.

bergerhoffer
bergerhoffer reviewed Oct 27, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@bergerhoffer bergerhoffer left a comment

Choose a reason for hiding this comment

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

These changes LGTM!

But I did see one playbook reference in this assembly that still has a number in it - cluster-scheduler-02-config.yml - just checking if that needed updated too or not.

@bergerhoffer bergerhoffer added the peer-review-done Signifies that the peer review team has reviewed this PR label Oct 27, 2020
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020

@bergerhoffer That should be fine to stay--not a part of the OSP UPI playbooks.

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020

Thanks!

@maxwelldb maxwelldb merged commit 849d2d5 into openshift:master Oct 27, 2020
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.5

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

@maxwelldb: #23235 failed to apply on top of branch "enterprise-4.5":

Applying: Remove OSP playbook # prefixes
Using index info to reconstruct a base tree...
M	modules/installation-osp-creating-bootstrap-machine.adoc
M	modules/installation-osp-creating-compute-machines.adoc
M	modules/installation-osp-creating-control-plane.adoc
M	modules/installation-osp-creating-network-resources.adoc
M	modules/installation-osp-deleting-bootstrap-resources.adoc
M	modules/installation-uninstall-infra.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/installation-uninstall-infra.adoc
CONFLICT (content): Merge conflict in modules/installation-uninstall-infra.adoc
Auto-merging modules/installation-osp-deleting-bootstrap-resources.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-deleting-bootstrap-resources.adoc
Auto-merging modules/installation-osp-creating-network-resources.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-network-resources.adoc
Auto-merging modules/installation-osp-creating-control-plane.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-control-plane.adoc
Auto-merging modules/installation-osp-creating-compute-machines.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-compute-machines.adoc
Auto-merging modules/installation-osp-creating-bootstrap-machine.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-creating-bootstrap-machine.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove OSP playbook # prefixes
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherry-pick enterprise-4.5

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.

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.6

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

/cherry-pick enterprise-4.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 27, 2020
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

@maxwelldb: new pull request created: #26796

Details

In response to this:

/cherry-pick enterprise-4.6

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.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Oct 27, 2020
Merged
@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Oct 27, 2020 •
edited by openshift-ci-robot
Loading

@maxwelldb: new pull request created: #26797

Details

In response to this:

/cherry-pick enterprise-4.7

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.

@maxwelldb maxwelldb mentioned this pull request Oct 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bergerhoffer bergerhoffer bergerhoffer left review comments

+1 more reviewer

@pierreprinetti pierreprinetti pierreprinetti approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@maxwelldb maxwelldb

Labels

branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

ShiftStack UPI Ansible playbooks no longer include numbers in names - 4.5+

7 participants

@maxwelldb @openshift-docs-preview-bot @openshift-cherrypick-robot @pierreprinetti @bergerhoffer @vikram-redhat @openshift-ci-robot