Skip to content

[4.x] Rename OpenStack -> common attributes across docs#22978

Merged
maxwelldb merged 1 commit intoopenshift:masterfrom
maxwelldb:osp-branding-all-docs-22975
Jun 24, 2020
Merged

[4.x] Rename OpenStack -> common attributes across docs#22978
maxwelldb merged 1 commit intoopenshift:masterfrom
maxwelldb:osp-branding-all-docs-22975

Conversation

@maxwelldb
Copy link
Copy Markdown
Contributor

@maxwelldb maxwelldb commented Jun 17, 2020

This PR resolves #22975.

@maxwelldb maxwelldb added this to the Next Release milestone Jun 17, 2020
@maxwelldb maxwelldb self-assigned this Jun 17, 2020
@maxwelldb maxwelldb changed the title OpenStack -> common attributes on Welcome page Rename OpenStack -> common attributes across docs Jun 17, 2020
@openshift-docs-preview-bot
Copy link
Copy Markdown

openshift-docs-preview-bot commented Jun 17, 2020

The preview will be available shortly at:

@maxwelldb maxwelldb force-pushed the osp-branding-all-docs-22975 branch from 7e5ee5d to 5c466e2 Compare June 23, 2020 17:18
@maxwelldb maxwelldb marked this pull request as ready for review June 23, 2020 17:18
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 23, 2020
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

@openshift/team-documentation PTAL. Easy if tedious review. :)

@maxwelldb maxwelldb added the peer-review-needed Signifies that the peer review team needs to review this PR label Jun 24, 2020
@bobfuru bobfuru self-requested a review June 24, 2020 17:10
bobfuru
bobfuru reviewed Jun 24, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@bobfuru bobfuru left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM! OCP 4.1 is no longer supported so unless you had a specific reason in mind, you shouldn't need to CP there.

@bobfuru bobfuru added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Jun 24, 2020
@bobfuru bobfuru mentioned this pull request Jun 24, 2020
Merged
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

@bobfuru Thanks!

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

Just went on autopilot for 4.*. Won't bother CPing there.

@maxwelldb maxwelldb changed the title Rename OpenStack -> common attributes across docs [4.x] Rename OpenStack -> common attributes across docs Jun 24, 2020
@maxwelldb
OpenStack -> common attributes on Welcome page
6f90944 
- Find and semi-manually sub in OSP attributes across most mods

- RHOSP attribute sub in APIs module
@maxwelldb maxwelldb force-pushed the osp-branding-all-docs-22975 branch from 5c466e2 to 6f90944 Compare June 24, 2020 19:50
@maxwelldb maxwelldb merged commit da2c266 into openshift:master Jun 24, 2020
@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

/cherry-pick enterprise-4.5

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 24, 2020

@maxwelldb: new pull request could not be created: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","field":"head","code":"invalid"}],"documentation_url":"https://developer.github.com/v3/pulls/#create-a-pull-request"}

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 Jun 24, 2020

/cherry-pick enterprise-4.3

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 24, 2020

@maxwelldb: new pull request could not be created: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","field":"head","code":"invalid"}],"documentation_url":"https://developer.github.com/v3/pulls/#create-a-pull-request"}

Details

In response to this:

/cherry-pick enterprise-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.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 24, 2020

@maxwelldb: #22978 failed to apply on top of branch "enterprise-4.3":

.git/rebase-apply/patch:597: trailing whitespace.
listeners. If you use Kuryr SDN on {rh-openstack} version 15 or earlier, UDP services are not supported. 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	modules/cluster-storage-operator.adoc
A	modules/cnf-understanding-low-latency.adoc
M	modules/installation-initializing.adoc
M	modules/installation-osp-about-kuryr.adoc
M	modules/installation-osp-config-yaml.adoc
A	modules/installation-osp-converting-ignition-resources.adoc
A	modules/installation-osp-creating-image.adoc
A	modules/installation-osp-creating-network-resources.adoc
M	modules/installation-osp-default-deployment.adoc
M	modules/installation-osp-default-kuryr-deployment.adoc
M	modules/installation-osp-describing-cloud-parameters.adoc
M	modules/installation-osp-enabling-swift.adoc
M	modules/installation-osp-kuryr-config-yaml.adoc
M	modules/installation-osp-kuryr-octavia-configuration.adoc
A	modules/installation-uninstall-infra.adoc
M	modules/openshift-cluster-maximums-major-releases.adoc
M	modules/recommended-configurable-storage-technology.adoc
M	welcome/index.adoc
Falling back to patching base and 3-way merge...
Auto-merging welcome/index.adoc
Auto-merging modules/recommended-configurable-storage-technology.adoc
Auto-merging modules/openshift-cluster-maximums-major-releases.adoc
CONFLICT (modify/delete): modules/installation-uninstall-infra.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/installation-uninstall-infra.adoc left in tree.
Auto-merging modules/installation-osp-kuryr-octavia-configuration.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-kuryr-octavia-configuration.adoc
Auto-merging modules/installation-osp-kuryr-config-yaml.adoc
Auto-merging modules/installation-osp-enabling-swift.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-enabling-swift.adoc
Auto-merging modules/installation-osp-describing-cloud-parameters.adoc
Auto-merging modules/installation-osp-default-kuryr-deployment.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-default-kuryr-deployment.adoc
Auto-merging modules/installation-osp-default-deployment.adoc
CONFLICT (content): Merge conflict in modules/installation-osp-default-deployment.adoc
CONFLICT (modify/delete): modules/installation-osp-creating-network-resources.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/installation-osp-creating-network-resources.adoc left in tree.
CONFLICT (modify/delete): modules/installation-osp-creating-image.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/installation-osp-creating-image.adoc left in tree.
CONFLICT (modify/delete): modules/installation-osp-converting-ignition-resources.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/installation-osp-converting-ignition-resources.adoc left in tree.
Auto-merging modules/installation-osp-config-yaml.adoc
Auto-merging modules/installation-osp-about-kuryr.adoc
Auto-merging modules/installation-initializing.adoc
CONFLICT (modify/delete): modules/cnf-understanding-low-latency.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/cnf-understanding-low-latency.adoc left in tree.
CONFLICT (modify/delete): modules/cluster-storage-operator.adoc deleted in HEAD and modified in OpenStack -> common attributes on Welcome page. Version OpenStack -> common attributes on Welcome page of modules/cluster-storage-operator.adoc left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 OpenStack -> common attributes on Welcome page
Details

In response to this:

/cherry-pick enterprise-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.

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

/cherry-pick enterprise-4.4

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 24, 2020

@maxwelldb: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift/openshift-docs\n ! [rejected] cherry-pick-22978-to-enterprise-4.4 -> cherry-pick-22978-to-enterprise-4.4 (non-fast-forward)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift/openshift-docs'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n", error: exit status 1

Details

In response to this:

/cherry-pick enterprise-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.

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

/cherry-pick enterprise-4.5

@maxwelldb
Copy link
Copy Markdown
Contributor Author

maxwelldb commented Jun 24, 2020

Quite manual, it is.

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 24, 2020

@maxwelldb: failed to push cherry-picked changes in GitHub: pushing failed, output: "To https://github.com/openshift/openshift-docs\n ! [rejected] cherry-pick-22978-to-enterprise-4.5 -> cherry-pick-22978-to-enterprise-4.5 (non-fast-forward)\nerror: failed to push some refs to 'https://openshift-cherrypick-robot:CENSORED@github.com/openshift/openshift-docs'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Integrate the remote changes (e.g.\nhint: 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n", error: exit status 1

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.

This was referenced Jun 24, 2020
Merged
Merged
Merged
Merged
@maxwelldb maxwelldb deleted the osp-branding-all-docs-22975 branch June 25, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@bobfuru bobfuru bobfuru left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@maxwelldb maxwelldb

Labels

branch/enterprise-4.2 branch/enterprise-4.3 branch/enterprise-4.4 branch/enterprise-4.5 peer-review-done Signifies that the peer review team has reviewed this PR

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

[4.x] Verify RHOSP branding compliance across docs

5 participants

@maxwelldb @openshift-docs-preview-bot @openshift-cherrypick-robot @bobfuru @openshift-ci-robot