From 4635480216fb49997d3e5eb6f80b1e5629fb2c5a Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 15 May 2020 11:42:06 -0400 Subject: [PATCH 1/6] Initial commit for add'l params --- .../installation-configuration-parameters.adoc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 3318635f8271..4f251e52b906 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -263,6 +263,14 @@ ifdef::osp[] |==== |Parameter|Description|Values +|`compute.platform.openstack.additionalNetworkIDs` +|Additional networks that are associated with compute machines. Allowed address pairs are not created for additional networks. +|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. + +|`compute.platform.openstack.additionalSecurityGroupIDs` +|Additional security groups that are associated with compute machines. +|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. + |`compute.platform.openstack.rootVolume.size` |For compute machines, the size in gigabytes of the root volume. If you do not set this value, machines use ephemeral storage. |Integer, for example `30`. @@ -271,6 +279,14 @@ ifdef::osp[] |For compute machines, the root volume's type. |String, for example `performance`. +|`controlPlane.platform.openstack.additionalNetworkIDs` +|Additional networks that are associated with control plane machines. Allowed address pairs are not created for additional networks. +|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. + +|`controlPlane.platform.openstack.additionalSecurityGroupIDs` +|Additional security groups that are associated with control plane machines. +|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. + |`controlPlane.platform.openstack.rootVolume.size` |For control plane machines, the size in gigabytes of the root volume. If you do not set this value, machines use ephemeral storage. |Integer, for example `30`. From 7b60e83f535ae5b5efff17686bb1e317010933bd Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 15 May 2020 11:47:53 -0400 Subject: [PATCH 2/6] Move optional params into separate table --- ...installation-configuration-parameters.adoc | 52 +++++++++++-------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 4f251e52b906..d36dcb5d3855 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -263,14 +263,6 @@ ifdef::osp[] |==== |Parameter|Description|Values -|`compute.platform.openstack.additionalNetworkIDs` -|Additional networks that are associated with compute machines. Allowed address pairs are not created for additional networks. -|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. - -|`compute.platform.openstack.additionalSecurityGroupIDs` -|Additional security groups that are associated with compute machines. -|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. - |`compute.platform.openstack.rootVolume.size` |For compute machines, the size in gigabytes of the root volume. If you do not set this value, machines use ephemeral storage. |Integer, for example `30`. @@ -279,14 +271,6 @@ ifdef::osp[] |For compute machines, the root volume's type. |String, for example `performance`. -|`controlPlane.platform.openstack.additionalNetworkIDs` -|Additional networks that are associated with control plane machines. Allowed address pairs are not created for additional networks. -|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. - -|`controlPlane.platform.openstack.additionalSecurityGroupIDs` -|Additional security groups that are associated with control plane machines. -|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. - |`controlPlane.platform.openstack.rootVolume.size` |For control plane machines, the size in gigabytes of the root volume. If you do not set this value, machines use ephemeral storage. |Integer, for example `30`. @@ -300,10 +284,6 @@ ifdef::osp[] `clouds.yaml` file. |String, for example `MyCloud`. -|`platform.openstack.externalDNS` -|_Optional_. IP addresses for external DNS servers that cluster instances use for DNS resolution. -|A list of IP addresses as strings, for example `["8.8.8.8", "192.168.1.12"]`. - |`platform.openstack.externalNetwork` |The {rh-openstack} external network name to be used for installation. |String, for example `external`. @@ -316,8 +296,36 @@ ifdef::osp[] |An existing floating IP address to associate with the load balancer API. |An IP address, for example `128.0.0.1`. + +|==== + +.Optional {rh-openstack} Parameters +[cols=".^2m,.^3a,^3a,options="header"] +|==== +|Parameter|Description|Values + +|`compute.platform.openstack.additionalNetworkIDs` +|Additional networks that are associated with compute machines. Allowed address pairs are not created for additional networks. +|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. + +|`compute.platform.openstack.additionalSecurityGroupIDs` +|Additional security groups that are associated with compute machines. +|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. + +|`controlPlane.platform.openstack.additionalNetworkIDs` +|Additional networks that are associated with control plane machines. Allowed address pairs are not created for additional networks. +|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. + +|`controlPlane.platform.openstack.additionalSecurityGroupIDs` +|Additional security groups that are associated with control plane machines. +|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. + +|`platform.openstack.externalDNS` +|IP addresses for external DNS servers that cluster instances use for DNS resolution. +|A list of IP addresses as strings, for example `["8.8.8.8", "192.168.1.12"]`. + |`platform.openstack.defaultMachinePlatform` -| _Optional_. The default machine pool platform configuration. +|The default machine pool platform configuration. | [source,json] ---- @@ -330,6 +338,8 @@ ifdef::osp[] } ---- |==== + + endif::osp[] ifdef::azure[] From ada8b70a21ea9f95123a2253f6742df47e8b94be Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 15 May 2020 11:50:28 -0400 Subject: [PATCH 3/6] Cleaning up linebreaks --- modules/installation-configuration-parameters.adoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index d36dcb5d3855..1f754a987ca5 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -295,8 +295,6 @@ ifdef::osp[] |`platform.openstack.lbFloatingIP` |An existing floating IP address to associate with the load balancer API. |An IP address, for example `128.0.0.1`. - - |==== .Optional {rh-openstack} Parameters From fb2e976a03f9401dd082c05e384f7534570474d8 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Fri, 15 May 2020 11:52:07 -0400 Subject: [PATCH 4/6] Lowercasin' --- modules/installation-configuration-parameters.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index 1f754a987ca5..fa57434f1a6b 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -297,7 +297,7 @@ ifdef::osp[] |An IP address, for example `128.0.0.1`. |==== -.Optional {rh-openstack} Parameters +.Optional {rh-openstack} parameters [cols=".^2m,.^3a,^3a,options="header"] |==== |Parameter|Description|Values From c1151974a3f6108e257db1571235076517ab5277 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Tue, 23 Jun 2020 10:06:57 -0400 Subject: [PATCH 5/6] Table format and conditional wrangling --- ...installation-configuration-parameters.adoc | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index fa57434f1a6b..e8fbfc446c5b 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -14,6 +14,8 @@ // * installing/installing_gcp/installing-gcp-vpc.adoc // * installing/installing_openstack/installing-openstack-installer-custom.adoc // * installing/installing_openstack/installing-openstack-installer-kuryr.adoc +// * installing/installing_openstack/installing-openstack-user.adoc +// * installing/installing_openstack/installing-openstack-user-kuryr.adoc // * installing/installing_rhv/installing-rhv-custom.adoc // * installing/installing_rhv/installing-rhv-default.adoc @@ -61,6 +63,14 @@ ifeval::["{context}" == "installing-openstack-installer-kuryr"] :osp: :osp-kuryr: endif::[] +ifeval::["{context}" == "installing-openstack-user"] +:osp: +:osp-custom: +endif::[] +ifeval::["{context}" == "installing-openstack-user-kuryr"] +:osp: +:osp-kuryr: +endif::[] [id="installation-configuration-parameters_{context}"] @@ -259,7 +269,7 @@ endif::aws[] ifdef::osp[] .Additional {rh-openstack-first} parameters -[cols=".^2m,.^3a,^3a,options="header"] +[%header, cols=".^2,.^3,.^5a"] |==== |Parameter|Description|Values @@ -298,23 +308,27 @@ ifdef::osp[] |==== .Optional {rh-openstack} parameters -[cols=".^2m,.^3a,^3a,options="header"] +[%header, cols=".^2,.^3,.^5a"] |==== |Parameter|Description|Values -|`compute.platform.openstack.additionalNetworkIDs` +|`compute.platform.openstack +.additionalNetworkIDs` |Additional networks that are associated with compute machines. Allowed address pairs are not created for additional networks. |A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. -|`compute.platform.openstack.additionalSecurityGroupIDs` +|`compute.platform.openstack +.additionalSecurityGroupIDs` |Additional security groups that are associated with compute machines. |A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. -|`controlPlane.platform.openstack.additionalNetworkIDs` +|`controlPlane.platform.openstack +.additionalNetworkIDs` |Additional networks that are associated with control plane machines. Allowed address pairs are not created for additional networks. |A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. -|`controlPlane.platform.openstack.additionalSecurityGroupIDs` +|`controlPlane.platform.openstack +.additionalSecurityGroupIDs` |Additional security groups that are associated with control plane machines. |A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. @@ -322,7 +336,8 @@ ifdef::osp[] |IP addresses for external DNS servers that cluster instances use for DNS resolution. |A list of IP addresses as strings, for example `["8.8.8.8", "192.168.1.12"]`. -|`platform.openstack.defaultMachinePlatform` +|`platform.openstack +.defaultMachinePlatform` |The default machine pool platform configuration. | [source,json] @@ -474,3 +489,11 @@ ifeval::["{context}" == "installing-openstack-installer-kuryr"] :!osp: :!osp-kuryr: endif::[] +ifeval::["{context}" == "installing-openstack-user"] +:!osp: +:!osp-custom: +endif::[] +ifeval::["{context}" == "installing-openstack-user-kuryr"] +:!osp: +:!osp-kuryr: +endif::[] From 6fd5010d8aa27d543d574a59d2fd0e1e6370f539 Mon Sep 17 00:00:00 2001 From: Max Bridges Date: Wed, 24 Jun 2020 10:44:55 -0400 Subject: [PATCH 6/6] Tweaks from peer feedback --- ...installation-configuration-parameters.adoc | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/modules/installation-configuration-parameters.adoc b/modules/installation-configuration-parameters.adoc index e8fbfc446c5b..5e29f64a25a6 100644 --- a/modules/installation-configuration-parameters.adoc +++ b/modules/installation-configuration-parameters.adoc @@ -312,32 +312,27 @@ ifdef::osp[] |==== |Parameter|Description|Values -|`compute.platform.openstack -.additionalNetworkIDs` +|`compute.platform.openstack.additionalNetworkIDs` |Additional networks that are associated with compute machines. Allowed address pairs are not created for additional networks. -|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. +|A list of one or more UUIDs as strings. For example, `fa806b2f-ac49-4bce-b9db-124bc64209bf`. -|`compute.platform.openstack -.additionalSecurityGroupIDs` +|`compute.platform.openstack.additionalSecurityGroupIDs` |Additional security groups that are associated with compute machines. -|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. +|A list of one or more UUIDs as strings. For example, `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. -|`controlPlane.platform.openstack -.additionalNetworkIDs` +|`controlPlane.platform.openstack.additionalNetworkIDs` |Additional networks that are associated with control plane machines. Allowed address pairs are not created for additional networks. -|A list of one or more UUIDs as strings, for example `fa806b2f-ac49-4bce-b9db-124bc64209bf`. +|A list of one or more UUIDs as strings. For example, `fa806b2f-ac49-4bce-b9db-124bc64209bf`. -|`controlPlane.platform.openstack -.additionalSecurityGroupIDs` +|`controlPlane.platform.openstack.additionalSecurityGroupIDs` |Additional security groups that are associated with control plane machines. -|A list of one or more UUIDs as strings, for example `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. +|A list of one or more UUIDs as strings. For example, `7ee219f3-d2e9-48a1-96c2-e7429f1b0da7`. |`platform.openstack.externalDNS` |IP addresses for external DNS servers that cluster instances use for DNS resolution. -|A list of IP addresses as strings, for example `["8.8.8.8", "192.168.1.12"]`. +|A list of IP addresses as strings. For example, `["8.8.8.8", "192.168.1.12"]`. -|`platform.openstack -.defaultMachinePlatform` +|`platform.openstack.defaultMachinePlatform` |The default machine pool platform configuration. | [source,json]