Merge pull request #3011 from shiftstack/OSASINFRA-1108

Bug 1802035: openstack UPI: Document Ansible
openshift · Feb 12, 2020 · 92bdcb3 · 92bdcb3
2 parents 5a23841 + 41293c1
commit 92bdcb3
Show file tree

Hide file tree

Showing 4 changed files with 232 additions and 418 deletions.
diff --git a/docs/user/openstack/README.md b/docs/user/openstack/README.md
@@ -39,6 +39,7 @@ In addition, it covers the installation with the default CNI (OpenShiftSDN), as
 - [Using the OSP 4 installer with Kuryr](kuryr.md)
 - [Troubleshooting your cluster](troubleshooting.md)
 - [Customizing your install](customization.md)
+- [Installing OpenShift on OpenStack User-Provisioned Infrastructure](install_upi.md)
 - [Learn about the OpenShift on OpenStack networking infrastructure design](../../design/openstack/networking-infrastructure.md)
 
 ## OpenStack Requirements

diff --git a/docs/user/openstack/customization.md b/docs/user/openstack/customization.md
@@ -2,6 +2,15 @@
 
 Beyond the [platform-agnostic `install-config.yaml` properties](../customization.md#platform-customization), the installer supports additional, OpenStack-specific properties.
 
+## Table of Contents
+
+* [Cluster-scoped properties](#cluster-scoped-properties)
+* [Machine pools](#machine-pools)
+* [Examples](#examples)
+  * [Minimal](#minimal)
+  * [Custom-machine-pools](#custom-machine-pools)
+* [Further customization](#further-customization)
+
 ## Cluster-scoped properties
 
 * `cloud` (required string): The name of the OpenStack cloud to use from `clouds.yaml`.
@@ -80,3 +89,7 @@ platform:
 pullSecret: '{"auths": ...}'
 sshKey: ssh-ed25519 AAAA...
 ```
+
+## Further customization
+
+For customizing the installation beyond what is possible with `openshift-install`, refer to the [UPI (User Provided Infrastructure) documentation](./install_upi.md).