Skip to content

Commit 8380cd2

Browse files
committed
OSDOCS-10524: Day-2 optional vSphere tags
1 parent 5c37830 commit 8380cd2

File tree

7 files changed

+88
-5
lines changed

7 files changed

+88
-5
lines changed

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-aws.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/cpmso-yaml-failure-domain-aws.adoc[leveloffset=+2]
2323
[id="cpmso-supported-features-aws_{context}"]
2424
== Enabling {aws-full} features for control plane machines
2525

26-
You can enable the following features by updating values in the control plane machine set.
26+
You can enable features by updating values in the control plane machine set.
2727

2828
//Restricting the API server to private (AWS control plane machine set version)
2929
include::modules/private-clusters-setting-api-private.adoc[leveloffset=+2]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-azure.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/cpmso-yaml-failure-domain-azure.adoc[leveloffset=+2]
2323
[id="cpmso-supported-features-azure_{context}"]
2424
== Enabling {azure-full} features for control plane machines
2525

26-
You can enable the following features by updating values in the control plane machine set.
26+
You can enable features by updating values in the control plane machine set.
2727

2828
include::modules/private-clusters-setting-api-private.adoc[leveloffset=+2]
2929
[role="_additional-resources"]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-gcp.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/cpmso-yaml-failure-domain-gcp.adoc[leveloffset=+2]
2323
[id="cpmso-supported-features-gcp_{context}"]
2424
== Enabling {gcp-full} features for control plane machines
2525

26-
You can enable the following features by updating values in the control plane machine set.
26+
You can enable features by updating values in the control plane machine set.
2727

2828
//Note: GCP GPU features should be compatible with CPMS, but dev cannot think of a use case. Leaving them out to keep things less cluttered. If a customer use case emerges, we can just add the necessary modules in here.
2929

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-openstack.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include::modules/cpmso-yaml-failure-domain-openstack.adoc[leveloffset=+2]
2323
[id="cpmso-supported-features-openstack_{context}"]
2424
== Enabling {rh-openstack-first} features for control plane machines
2525

26-
You can enable the following features by updating values in the control plane machine set.
26+
You can enable features by updating values in the control plane machine set.
2727

2828
//Changing the OpenStack Nova flavor by using a control plane machine set
2929
include::modules/cpms-changing-openstack-flavor-type.adoc[leveloffset=+2]

machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-vsphere.adoc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,12 @@ include::modules/cpmso-yaml-failure-domain-vsphere.adoc[leveloffset=+2]
2222

2323
[role="_additional-resources"]
2424
.Additional resources
25-
* xref:../../../post_installation_configuration/post-install-vsphere-zones-regions-configuration.adoc#specifying-regions-zones-infrastructure-vsphere_post-install-vsphere-zones-regions-configuration[Specifying multiple regions and zones for your cluster on {vmw-short}]
25+
* xref:../../../post_installation_configuration/post-install-vsphere-zones-regions-configuration.adoc#specifying-regions-zones-infrastructure-vsphere_post-install-vsphere-zones-regions-configuration[Specifying multiple regions and zones for your cluster on {vmw-short}]
26+
27+
[id="cpmso-supported-features-vsphere_{context}"]
28+
== Enabling {vmw-full} features for control plane machines
29+
30+
You can enable features by updating values in the control plane machine set.
31+
32+
//Adding tags to machines by using machine sets
33+
include::modules/machine-api-vmw-add-tags.adoc[leveloffset=+2,tag=!compute]

machine_management/creating_machinesets/creating-machineset-vsphere.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,6 @@ include::modules/machineset-upi-reqs-ignition-config.adoc[leveloffset=+2]
3737
3838
//Creating a compute machine set
3939
include::modules/machineset-creating.adoc[leveloffset=+1]
40+
41+
//Adding tags to machines by using machine sets
42+
include::modules/machine-api-vmw-add-tags.adoc[leveloffset=+1,tag=!controlplane]

modules/machine-api-vmw-add-tags.adoc

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// Module included in the following assemblies:
2+
//
3+
// * machine_management/creating_machinesets/creating-machineset-vsphere.adoc
4+
// * machine_management/control_plane_machine_management/cpmso_provider_configurations/cpmso-config-options-vsphere.adoc
5+
6+
:_mod-docs-content-type: PROCEDURE
7+
[id="machine-api-vmw-add-tags_{context}"]
8+
= Adding tags to machines by using machine sets
9+
10+
{product-title} adds a cluster-specific tag to each virtual machine (VM) that it creates.
11+
The installation program uses these tags to select the VMs to delete when uninstalling a cluster.
12+
13+
In addition to the cluster-specific tags assigned to VMs, you can configure a machine set to add up to 10 additional {vmw-short} tags to the VMs it provisions.
14+
15+
.Prerequisites
16+
17+
* You have access to an {product-title} cluster installed on {vmw-short} using an account with `cluster-admin` permissions.
18+
* You have access to the VMware vCenter console associated with your cluster.
19+
* You have created a tag in the vCenter console.
20+
* You have installed the {oc-first}.
21+
22+
.Procedure
23+
24+
. Use the vCenter console to find the tag ID for any tag that you want to add to your machines:
25+
26+
.. Log in to the vCenter console.
27+
28+
.. From the *Home* menu, click *Tags & Custom Attributes*.
29+
30+
.. Select a tag that you want to add to your machines.
31+
32+
.. Use the browser URL for the tag that you select to identify the tag ID.
33+
+
34+
.Example tag URL
35+
[source,text]
36+
----
37+
https://vcenter.example.com/ui/app/tags/tag/urn:vmomi:InventoryServiceTag:208e713c-cae3-4b7f-918e-4051ca7d1f97:GLOBAL/permissions
38+
----
39+
+
40+
.Example tag ID
41+
[source,text]
42+
----
43+
urn:vmomi:InventoryServiceTag:208e713c-cae3-4b7f-918e-4051ca7d1f97:GLOBAL
44+
----
45+
46+
. In a text editor, open the YAML file for an existing machine set or create a new one.
47+
48+
. Edit the following lines under the `providerSpec` field:
49+
+
50+
[source,yaml]
51+
----
52+
tag::compute[]
53+
apiVersion: machine.openshift.io/v1beta1
54+
kind: MachineSet
55+
end::compute[]
56+
tag::controlplane[]
57+
apiVersion: machine.openshift.io/v1
58+
kind: ControlPlaneMachineSet
59+
end::controlplane[]
60+
# ...
61+
spec:
62+
template:
63+
spec:
64+
providerSpec:
65+
value:
66+
tagIDs: # <1>
67+
- <tag_id_value> # <2>
68+
# ...
69+
----
70+
<1> Specify a list of up to 10 tags to add to the machines that this machine set provisions.
71+
<2> Specify the value of the tag that you want to add to your machines.
72+
For example, `urn:vmomi:InventoryServiceTag:208e713c-cae3-4b7f-918e-4051ca7d1f97:GLOBAL`.

0 commit comments

Comments
 (0)