Skip to content

Commit b7dfc9f

Browse files
committed
OSDOCS-10635: Docs for Cluster API Provider OpenStack pre-4.18
1 parent 2af3739 commit b7dfc9f

17 files changed

+286
-31
lines changed

_topic_maps/_topic_map.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2463,6 +2463,8 @@ Topics:
24632463
File: cluster-api-config-options-aws
24642464
- Name: Cluster API configuration options for Google Cloud Platform
24652465
File: cluster-api-config-options-gcp
2466+
- Name: Cluster API configuration options for Red Hat OpenStack Platform
2467+
File: cluster-api-config-options-rhosp
24662468
- Name: Cluster API configuration options for VMware vSphere
24672469
File: cluster-api-config-options-vsphere
24682470
# - Name: Cluster API resiliency and recovery

machine_management/cluster_api_machine_management/cluster-api-about.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ toc::[]
99
:FeatureName: Managing machines with the Cluster API
1010
include::snippets/technology-preview.adoc[]
1111

12-
The link:https://cluster-api.sigs.k8s.io/[Cluster API] is an upstream project that is integrated into {product-title} as a Technology Preview for {aws-first}, {gcp-first}, and {vmw-first}.
12+
The link:https://cluster-api.sigs.k8s.io/[Cluster API] is an upstream project that is integrated into {product-title} as a Technology Preview for {aws-first}, {gcp-first}, {rh-openstack-first}, and {vmw-first}.
1313

1414
//Cluster API overview
1515
include::modules/capi-overview.adoc[leveloffset=+1]

machine_management/cluster_api_machine_management/cluster-api-configuration.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ For provider-specific configuration options for your cluster, see the following
2424

2525
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#cluster-api-config-options-gcp[Cluster API configuration options for {gcp-full}]
2626

27+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#cluster-api-config-options-rhosp[Cluster API configuration options for {rh-openstack}]
28+
2729
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#cluster-api-config-options-vsphere[Cluster API configuration options for {vmw-full}]

machine_management/cluster_api_machine_management/cluster-api-getting-started.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ include::modules/capi-creating-infrastructure-resource.adoc[leveloffset=+2]
3333
.Additional resources
3434
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-infrastructure-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API infrastructure resource on {aws-full}]
3535
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-infrastructure-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API infrastructure resource on {gcp-full}]
36+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#capi-yaml-infrastructure-rhosp_cluster-api-config-options-rhosp[Sample YAML for a Cluster API infrastructure resource on {rh-openstack}]
3637
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-infrastructure-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API infrastructure resource on {vmw-full}]
3738

3839
//Creating a Cluster API machine template
@@ -41,6 +42,7 @@ include::modules/capi-creating-machine-template.adoc[leveloffset=+2]
4142
.Additional resources
4243
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-template-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API machine template resource on {aws-full}]
4344
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-template-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API machine template resource on {gcp-full}]
45+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#capi-yaml-machine-template-rhosp_cluster-api-config-options-rhosp[Sample YAML for a Cluster API machine template resource on {rh-openstack}]
4446
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-template-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API machine template resource on {vmw-full}]
4547

4648
//Creating a Cluster API compute machine set
@@ -49,4 +51,5 @@ include::modules/capi-creating-machine-set.adoc[leveloffset=+2]
4951
.Additional resources
5052
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-set-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API compute machine set resource on {aws-full}]
5153
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-set-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API compute machine set resource on {gcp-full}]
54+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#capi-yaml-machine-set-rhosp_cluster-api-config-options-rhosp[Sample YAML for a Cluster API compute machine set resource on {rh-openstack}]
5255
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-set-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API compute machine set resource on {vmw-full}]

machine_management/cluster_api_machine_management/cluster-api-managing-machines.adoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include::modules/capi-modifying-machine-template.adoc[leveloffset=+1]
1515
.Additional resources
1616
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-template-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API machine template resource on {aws-full}]
1717
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-template-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API machine template resource on {gcp-full}]
18+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#capi-yaml-machine-template-rhosp_cluster-api-config-options-rhosp[Sample YAML for a Cluster API machine template resource on {rh-openstack}]
1819
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-template-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API machine template resource on {vmw-full}]
1920
* xref:../../machine_management/cluster_api_machine_management/cluster-api-managing-machines.adoc#machineset-modifying_cluster-api-managing-machines[Modifying a compute machine set by using the CLI]
2021
@@ -25,4 +26,5 @@ include::modules/machineset-modifying.adoc[leveloffset=+1,tag=!MAPI]
2526
.Additional resources
2627
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-aws.adoc#capi-yaml-machine-set-aws_cluster-api-config-options-aws[Sample YAML for a Cluster API compute machine set resource on {aws-full}]
2728
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-gcp.adoc#capi-yaml-machine-set-gcp_cluster-api-config-options-gcp[Sample YAML for a Cluster API compute machine set resource on {gcp-full}]
29+
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-rhosp.adoc#capi-yaml-machine-set-rhosp_cluster-api-config-options-rhosp[Sample YAML for a Cluster API compute machine set resource on {rh-openstack}]
2830
* xref:../../machine_management/cluster_api_machine_management/cluster_api_provider_configurations/cluster-api-config-options-vsphere.adoc#capi-yaml-machine-set-vsphere_cluster-api-config-options-vsphere[Sample YAML for a Cluster API compute machine set resource on {vmw-full}]
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
:_mod-docs-content-type: ASSEMBLY
2+
[id="cluster-api-config-options-rhosp"]
3+
= Cluster API configuration options for Red{nbsp}Hat OpenStack Platform
4+
include::_attributes/common-attributes.adoc[]
5+
:context: cluster-api-config-options-rhosp
6+
7+
toc::[]
8+
9+
:FeatureName: Managing machines with the Cluster API
10+
include::snippets/technology-preview.adoc[]
11+
12+
You can change the configuration of your {rh-openstack-first} Cluster API machines by updating values in the Cluster API custom resource manifests.
13+
14+
[id="cluster-api-sample-yaml-rhosp_{context}"]
15+
== Sample YAML for configuring {rh-openstack} clusters
16+
17+
The following example YAML files show configurations for a {rh-openstack} cluster.
18+
19+
//Sample YAML for a CAPI RHOSP infrastructure resource
20+
include::modules/capi-yaml-infrastructure-rhosp.adoc[leveloffset=+2]
21+
22+
//Sample YAML for CAPI RHOSP machine template resource
23+
include::modules/capi-yaml-machine-template-rhosp.adoc[leveloffset=+2]
24+
25+
//Sample YAML for a CAPI RHOSP compute machine set resource
26+
include::modules/capi-yaml-machine-set-rhosp.adoc[leveloffset=+2]
27+
28+
// [id="cluster-api-supported-features-rhosp_{context}"]
29+
// == Enabling {rh-openstack} features with the Cluster API
30+
31+
// You can enable the following features by updating values in the Cluster API custom resource manifests.
32+
33+
//Not sure what, if anything, we can add here at this time.

modules/capi-arch-resources.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The Cluster API consists of the following primary resources. For the Technology
1010

1111
Cluster:: A fundamental unit that represents a cluster that is managed by the Cluster API.
1212

13-
Infrastructure:: A provider-specific resource that defines properties that are shared by all the compute machine sets in the cluster, such as the region and subnets.
13+
Infrastructure cluster:: A provider-specific resource that defines properties that are shared by all the compute machine sets in the cluster, such as the region and subnets.
1414

1515
Machine template:: A provider-specific template that defines the properties of the machines that a compute machine set creates.
1616

modules/capi-creating-cluster-resource.adoc

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,22 @@ spec:
4343
<2> Specify the infrastructure kind for the cluster.
4444
The following values are valid:
4545
+
46-
* `AWSCluster`: The cluster is running on {aws-first}.
47-
* `GCPCluster`: The cluster is running on {gcp-first}.
48-
* `VSphereCluster`: The cluster is running on {vmw-first}.
46+
|====
47+
|Cluster cloud provider |Value
48+
49+
|{aws-first}
50+
|`AWSCluster`
51+
52+
|{gcp-first}
53+
|`GCPCluster`
54+
55+
|{rh-openstack-first}
56+
|`OpenStackCluster`
57+
58+
|{vmw-first}
59+
|`VSphereCluster`
60+
61+
|====
4962
--
5063

5164
. Create the cluster CR by running the following command:

modules/capi-creating-infrastructure-resource.adoc

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,27 @@ spec: # <4>
4040
For more information, see the sample Cluster API infrastructure resource YAML for your provider.
4141
The following values are valid:
4242
* `infrastructure.cluster.x-k8s.io/v1beta2`: The version that {aws-first} clusters use.
43-
* `infrastructure.cluster.x-k8s.io/v1beta1`: The version that {gcp-first} and {vmw-first} clusters use.
43+
* `infrastructure.cluster.x-k8s.io/v1beta1`: The version that {gcp-first}, {rh-openstack-first} and {vmw-first} clusters use.
4444
<2> Specify the infrastructure kind for the cluster.
4545
This value must match the value for your platform.
4646
The following values are valid:
47-
* `AWSCluster`: The cluster is running on {aws-short}.
48-
* `GCPCluster`: The cluster is running on {gcp-short}.
49-
* `VSphereCluster`: The cluster is running on {vmw-short}.
47+
+
48+
|====
49+
|Cluster cloud provider |Value
50+
51+
|{aws-first}
52+
|`AWSCluster`
53+
54+
|{gcp-first}
55+
|`GCPCluster`
56+
57+
|{rh-openstack-first}
58+
|`OpenStackCluster`
59+
60+
|{vmw-first}
61+
|`VSphereCluster`
62+
63+
|====
5064
<3> Specify the name of the cluster.
5165
<4> Specify the details for your environment.
5266
These parameters are provider specific.

modules/capi-creating-machine-template.adoc

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,25 @@ spec:
3636
template:
3737
spec: # <3>
3838
----
39-
<1> Specify the machine template kind. This value must match the value for your platform. The following values are valid:
40-
* `AWSMachineTemplate`: The cluster is running on {aws-first}.
41-
* `GCPMachineTemplate`: The cluster is running on {gcp-first}.
42-
* `VSphereMachineTemplate`: The cluster is running on {vmw-first}.
39+
<1> Specify the machine template kind. This value must match the value for your platform.
40+
The following values are valid:
41+
+
42+
|====
43+
|Cluster cloud provider |Value
44+
45+
|{aws-first}
46+
|`MachineTemplate`
47+
48+
|{gcp-first}
49+
|`MachineTemplate`
50+
51+
|{rh-openstack-first}
52+
|`OpenStackMachineTemplate`
53+
54+
|{vmw-first}
55+
|`VSphereMachineTemplate`
56+
57+
|====
4358
<2> Specify a name for the machine template.
4459
<3> Specify the details for your environment. These parameters are provider specific. For more information, see the sample Cluster API machine template YAML for your provider.
4560
--

0 commit comments

Comments
 (0)