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

[enterprise-4.9] BZ1860721: adding certificate customizations #35632

Merged
merged 1 commit into from
Aug 19, 2021
Merged

[enterprise-4.9] BZ1860721: adding certificate customizations #35632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions modules/installation-initializing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
endif::[]
ifeval::["{context}" == "installing-restricted-networks-gcp"]
:gcp:
:restricted:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
:gcp:
Expand Down Expand Up @@ -158,7 +159,7 @@ endif::rhv[]

* Obtain the {product-title} installation program and the pull secret for your cluster.
ifdef::restricted[]
For a restricted network installation, these files are on your bastion host.
For a restricted network installation, these files are on your mirror host.
* Have the `imageContentSources` values that were generated during mirror registry creation.
* Obtain the contents of the certificate for your mirror registry.
ifndef::aws,gcp[]
Expand Down Expand Up @@ -425,10 +426,10 @@ your registry:
+
[source,yaml]
----
pullSecret: '{"auths":{"<bastion_host_name>:5000": {"auth": "<credentials>","email": "you@example.com"}}}'
pullSecret: '{"auths":{"<mirror_host_name>:5000": {"auth": "<credentials>","email": "you@example.com"}}}'
----
+
For `<bastion_host_name>`, specify the registry domain name
For `<mirror_host_name>`, specify the registry domain name
that you specified in the certificate for your mirror registry, and for
`<credentials>`, specify the base64-encoded user name and password for
your mirror registry.
Expand Down Expand Up @@ -474,10 +475,10 @@ endif::gcp+restricted[]
----
imageContentSources:
- mirrors:
- <bastion_host_name>:5000/<repo_name>/release
- <mirror_host_name>:5000/<repo_name>/release
source: quay.example.com/openshift-release-dev/ocp-release
- mirrors:
- <bastion_host_name>:5000/<repo_name>/release
- <mirror_host_name>:5000/<repo_name>/release
source: registry.example.com/ocp/release
----
+
Expand Down Expand Up @@ -538,6 +539,10 @@ endif::[]
ifeval::["{context}" == "installing-gcp-user-infra-vpc"]
:!gcp:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-gcp"]
:!gcp:
:!restricted:
endif::[]
ifeval::["{context}" == "installing-restricted-networks-gcp-installer-provisioned"]
:!gcp:
:!restricted:
Expand Down