Skip to content

Commit c1a824f

Browse files
author
JoeAldinger
committed
OSDOCS-9239:removes modules in assembly installing OSP installer kuryr
1 parent 51b84e4 commit c1a824f

File tree

62 files changed

+29
-1287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+29
-1287
lines changed

installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc

Lines changed: 0 additions & 89 deletions
This file was deleted.

modules/cli-logging-in-kubeadmin.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
// * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
3939
// * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
4040
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
41-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
4241
// * installing/installing_openstack/installing-openstack-installer.adoc
4342
// * installing/installing_aws/installing-restricted-networks-aws.adoc
4443
// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc

modules/cluster-entitlements.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,10 @@
4242
// * installing/installing_aws/installing-aws-secret-region.adoc
4343
// * installing/installing_aws/installing-aws-china-region.adoc
4444
// * installing/installing_aws/installing-aws-outposts-remote-workers.adoc
45-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
4645
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
4746
// * installing/installing_openstack/installing-openstack-user.adoc
48-
// * installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
4947
// * installing/installing_openstack/installing-openstack-user-sr-iov.adoc
5048
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
51-
// * installing/installing_openstack/installing-openstack-user-kuryr.adoc
5249
// * installing/installing_openstack/installing-openstack-installer.adoc
5350
// * installing/installing_openstack/installing-openstack-installer-sr-iov.adoc
5451
// * installing/installing_gcp/installing-gcp-customizations.adoc

modules/cluster-telemetry.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@
3737
// * installing/installing_aws/installing-aws-government-region.adoc
3838
// * installing/installing_aws/installing-aws-china.adoc
3939
// * installing/installing_aws/installing-aws-outposts-remote-workers.adoc
40-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
4140
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
4241
// * installing/installing_openstack/installing-openstack-user.adoc
43-
// * installing/installing_openstack/installing-openstack-user-sr-iov-kuryr.adoc
4442
// * installing/installing_openstack/installing-openstack-user-sr-iov.adoc
4543
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
46-
// * installing/installing_openstack/installing-openstack-user-kuryr.adoc
4744
// * installing/installing_openstack/installing-openstack-installer.adoc
4845
// * installing/installing_openstack/installing-openstack-installer-sr-iov.adoc
4946
// * installing/installing_gcp/installing-gcp-customizations.adoc

modules/idle-unidling-applications.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,3 @@ $ oc scale --replicas=1 dc <dc_name>
2626
Automatic unidling by a router is currently only supported by the default
2727
HAProxy router.
2828
====
29-
[NOTE]
30-
====
31-
Services do not support automatic unidling if you configure Kuryr-Kubernetes as an SDN.
32-
====

modules/installation-configuration-parameters.adoc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,6 @@ Optional {rh-openstack} configuration parameters are described in the following
11011101
zones:
11021102
|{rh-openstack} Compute (Nova) availability zones (AZs) to install machines on. If this parameter is not set, the installation program relies on the default settings for Nova that the {rh-openstack} administrator configured.
11031103

1104-
On clusters that use Kuryr, {rh-openstack} Octavia does not support availability zones. Load balancers and, if you are using the Amphora provider driver, {product-title} services that rely on Amphora VMs, are not created according to the value of this property.
11051104
|A list of strings. For example, `["zone-1", "zone-2"]`.
11061105

11071106
|compute:
@@ -1137,7 +1136,6 @@ Additional networks that are attached to a control plane machine are also attach
11371136
zones:
11381137
|{rh-openstack} Compute (Nova) availability zones (AZs) to install machines on. If this parameter is not set, the installation program relies on the default settings for Nova that the {rh-openstack} administrator configured.
11391138

1140-
On clusters that use Kuryr, {rh-openstack} Octavia does not support availability zones. Load balancers and, if you are using the Amphora provider driver, {product-title} services that rely on Amphora VMs, are not created according to the value of this property.
11411139
|A list of strings. For example, `["zone-1", "zone-2"]`.
11421140

11431141
|controlPlane:

modules/installation-configure-proxy.adoc

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
// * installing/installing_bare_metal/installing-bare-metal.adoc
3434
// * installing/installing_bare_metal/installing-restricted-networks-bare-metal.adoc
3535
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
36-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
3736
// * installing/installing_openstack/installing-openstack-installer-sr-iov.adoc
3837
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
3938
// * installing/installing_vsphere/installing-restricted-networks-vsphere.adoc
@@ -114,12 +113,6 @@ endif::[]
114113
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
115114
:vsphere:
116115
endif::[]
117-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
118-
:kuryr:
119-
endif::[]
120-
ifeval::["{context}" == "installing-openstack-installer-restricted"]
121-
:kuryr:
122-
endif::[]
123116

124117
:_mod-docs-content-type: PROCEDURE
125118
[id="installation-configure-proxy_{context}"]
@@ -139,27 +132,8 @@ range that is specified in the `networking.machineNetwork[].cidr` field in the
139132
====
140133
endif::bare-metal[]
141134

142-
ifdef::kuryr[]
143-
[NOTE]
144-
====
145-
Kuryr installations default to HTTP proxies.
146-
====
147-
endif::kuryr[]
148-
149135
.Prerequisites
150136

151-
ifdef::kuryr[]
152-
153-
* For Kuryr installations on restricted networks that use the `Proxy` object, the proxy must be able to reply to the router that the cluster uses. To add a static route for the proxy configuration, from a command line as the root user, enter:
154-
+
155-
[source,terminal]
156-
----
157-
$ ip route add <cluster_network_cidr> via <installer_subnet_gateway>
158-
----
159-
160-
* The restricted subnet must have a gateway that is defined and available to be linked to the `Router` resource that Kuryr creates.
161-
162-
endif::kuryr[]
163137
* You have an existing `install-config.yaml` file.
164138
// TODO: xref (../../installing/install_config/configuring-firewall.adoc#configuring-firewall)
165139
* You reviewed the sites that your cluster requires access to and determined whether any of them need to bypass the proxy. By default, all cluster egress traffic is proxied, including calls to hosting cloud provider APIs. You added sites to the `Proxy` object's `spec.noProxy` field to bypass the proxy if necessary.
@@ -296,9 +270,3 @@ endif::[]
296270
ifeval::["{context}" == "installing-restricted-networks-installer-provisioned-vsphere"]
297271
:!vsphere:
298272
endif::[]
299-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
300-
:!kuryr:
301-
endif::[]
302-
ifeval::["{context}" == "installing-openstack-installer-restricted"]
303-
:!kuryr:
304-
endif::[]

modules/installation-initializing.adoc

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
// * installing/installing_ibm_powervs/installing-restricted-networks-ibm-power-vs.adoc
2929
// * installing/installing_ibm_powervs/installing-ibm-powervs-vpc.adoc
3030
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
31-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
3231
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
33-
// * installing/installing_openstack/installing-openstack-user-kuryr.adoc
3432
// * installing/installing_openstack/installing-openstack-user.adoc
3533
// * installing/installing_vmc/installing-vmc-customizations.adoc
3634
// * installing/installing_vmc/installing-vmc-network-customizations.adoc
@@ -137,25 +135,14 @@ endif::[]
137135
ifeval::["{context}" == "installing-openstack-installer-custom"]
138136
:osp:
139137
endif::[]
140-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
141-
:osp:
142-
endif::[]
143138
ifeval::["{context}" == "installing-openstack-user"]
144139
:osp:
145140
:osp-user:
146141
endif::[]
147-
ifeval::["{context}" == "installing-openstack-user-kuryr"]
148-
:osp:
149-
:osp-user:
150-
endif::[]
151142
ifeval::["{context}" == "installing-openstack-user-sr-iov"]
152143
:osp:
153144
:osp-user:
154145
endif::[]
155-
ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
156-
:osp:
157-
:osp-user:
158-
endif::[]
159146
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
160147
:vsphere:
161148
:three-node-cluster:
@@ -720,25 +707,14 @@ endif::[]
720707
ifeval::["{context}" == "installing-openstack-installer-custom"]
721708
:!osp:
722709
endif::[]
723-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
724-
:!osp:
725-
endif::[]
726710
ifeval::["{context}" == "installing-openstack-user"]
727711
:!osp:
728712
:!osp-user:
729713
endif::[]
730-
ifeval::["{context}" == "installing-openstack-user-kuryr"]
731-
:!osp:
732-
:!osp-user:
733-
endif::[]
734714
ifeval::["{context}" == "installing-openstack-user-sr-iov"]
735715
:!osp:
736716
:!osp-user:
737717
endif::[]
738-
ifeval::["{context}" == "installing-openstack-user-sr-iov-kuryr"]
739-
:!osp:
740-
:!osp-user:
741-
endif::[]
742718
ifeval::["{context}" == "installing-vsphere-installer-provisioned-customizations"]
743719
:!vsphere:
744720
:!three-node-cluster:

modules/installation-launching-installer.adoc

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
// * installing/installing_gcp/installing-ibm-cloud-customizations.adoc
2828
// * installing/installing_gcp/installing-ibm-cloud-vpc.adoc
2929
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
30-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
3130
// * installing/installing_openstack/installing-openstack-installer-restricted.adoc
3231
// * installing/installing_openstack/installing-openstack-installer.adoc
3332
// * installing/installing_vsphere/installing-vsphere-installer-provisioned.adoc
@@ -177,11 +176,6 @@ ifeval::["{context}" == "installing-openstack-installer-custom"]
177176
:custom-config:
178177
:single-step:
179178
endif::[]
180-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
181-
:osp:
182-
:custom-config:
183-
:single-step:
184-
endif::[]
185179
ifeval::["{context}" == "installing-openstack-installer-restricted"]
186180
:osp:
187181
:custom-config:
@@ -667,11 +661,6 @@ ifeval::["{context}" == "installing-openstack-installer-custom"]
667661
:!custom-config:
668662
:!single-step:
669663
endif::[]
670-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
671-
:!osp:
672-
:!custom-config:
673-
:!single-step:
674-
endif::[]
675664
ifeval::["{context}" == "installing-openstack-installer-restricted"]
676665
:!osp:
677666
:!custom-config:

modules/installation-load-balancing-user-infra.adoc

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,18 @@
1010
// * installing/installing_ibm_z/installing-ibm-power.adoc
1111
// * installing/installing_ibm_z/installing-restricted-networks-ibm-power.adoc
1212
// * installing/installing_openstack/installing-openstack-installer-custom.adoc
13-
// * installing/installing_openstack/installing-openstack-installer-kuryr.adoc
14-
// * installing/installing_vsphere/upi/upi-vsphere-installation-reqs.adoc
13+
14+
ifeval::["{context}" == "installing-vsphere"]
15+
:vsphere:
16+
endif::[]
17+
18+
ifeval::["{context}" == "installing-restricted-networks-vsphere"]
19+
:vsphere:
20+
endif::[]
21+
22+
ifeval::["{context}" == "installing-vsphere-network-customizations"]
23+
:vsphere:
24+
endif::[]
1525

1626
ifeval::["{context}" == "installing-ibm-z"]
1727
:ibm-z:
@@ -31,9 +41,6 @@ endif::[]
3141
ifeval::["{context}" == "installing-openstack-installer-custom"]
3242
:user-managed-lb:
3343
endif::[]
34-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
35-
:user-managed-lb:
36-
endif::[]
3744

3845
:_mod-docs-content-type: CONCEPT
3946
[id="installation-load-balancing-user-infra_{context}"]
@@ -258,7 +265,4 @@ ifeval::["{context}" == "installing-restricted-networks-bare-metal"]
258265
endif::[]
259266
ifeval::["{context}" == "installing-openstack-installer-custom"]
260267
:!user-managed-lb:
261-
endif::[]
262-
ifeval::["{context}" == "installing-openstack-installer-kuryr"]
263-
:!user-managed-lb:
264-
endif::[]
268+
endif::[]

0 commit comments

Comments
 (0)