Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ospdo qa comments changes #815

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

pinikomarov
Copy link
Contributor

@pinikomarov pinikomarov commented Feb 19, 2025

Jira: https://issues.redhat.com/browse/OSPRH-14176

Ongoing work .. more sections to be added

Copy link

openshift-ci bot commented Feb 19, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link

openshift-ci bot commented Feb 19, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign ciecierski for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pinikomarov pinikomarov force-pushed the ospdo_adoption_docs_requested_changes branch 3 times, most recently from eaace95 to 631d680 Compare February 23, 2025 13:05
@@ -24,7 +24,7 @@ The following features are considered a Technology Preview and have not been tes
** AMD SEV
** Direct download from Rados Block Device (RBD)
** File-backed memory
** `Provider.yaml`
** Multipule data plane nodesets
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
** Multipule data plane nodesets
** Multiple data plane node sets

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -11,6 +11,9 @@ Planning information::
* Review the adoption-specific networking requirements. For more information, see xref:configuring-network-for-RHOSO-deployment_planning[Configuring the network for the RHOSO deployment].
* Review the adoption-specific storage requirements. For more information, see xref:storage-requirements_configuring-network[Storage requirements].
* Review how to customize your deployed control plane with the services that are required for your environment. For more information, see link:{customizing-rhoso}/index[{customizing-rhoso-t}].
ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've been using the following conditional statement for any ospdo content:
ifeval::["{build_variant}" == "ospdo"]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok I'll change the rest too

Comment on lines 15 to 16
* Familiarize yourself with disconnected environments deployment.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#proc_configuring-an-airgapped-environment_air-gapped-environment[Configuring an airgapped environment].
endif::[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Familiarize yourself with disconnected environments deployment.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#proc_configuring-an-airgapped-environment_air-gapped-environment[Configuring an airgapped environment].
endif::[]
* Familiarize yourself with a disconnected environment deployment. For more information, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#proc_configuring-an-airgapped-environment_air-gapped-environment[Configuring an airgapped environment] in _Deploying an overcloud in a Red Hat OpenShift Container Platform cluster with director Operator_.
endif::[]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -6,6 +6,9 @@ Familiarize yourself with the steps of the adoption process and the optional pos

.Main adoption process

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the ifeval should be ifeval::["{build_variant}" == "ospdo"]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure what to add here , wip

@@ -6,6 +6,9 @@ Familiarize yourself with the steps of the adoption process and the optional pos

.Main adoption process

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
. xref:ospdo_scale_down_pre_database_adoption[Scaling down director Operator resources].
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
. xref:ospdo_scale_down_pre_database_adoption[Scaling down director Operator resources].
. xref:ospdo_scale_down_pre_database_adoption_adopt-control-plane[Scaling down director Operator resources].

I think this will render correctly in the preview. If not, the topic ID in the "Scaling down" file itself might need to be updated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

id does render correctly

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link in the preview is not working. It doesn't navigate to the "Scaling down director Operator resources" section.

Comment on lines 94 to 112
.. Reduce the roleCount for controller role in the OpenStackControlPlane CR to "1":
----
oc -n openstack patch OpenStackControlPlane overcloud --type json -p '[{"op": "replace", "path":"/spec/virtualMachineRoles/controller/roleCount", "value": 1}]'
.. Ensure that the openstackclient pod is running on the same OCP nodes as the remaining controller VM. If its not on the same node, then move it by cordoning off the two nodes that have been freed up for RHOSO and deleting the openstackclient pod so that it gets rescheduled on the OCP node that has the remaining controller VM. Once the pod has moved to the correct node, uncordon all nodes.
----
oc adm cordon $OSP18_NODE1
oc adm cordon $OSP18_NODE2
oc delete pod openstackclient
oc adm uncordon $OSP18_NODE1
oc adm uncordon $OSP18_NODE2
----
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.. Reduce the roleCount for controller role in the OpenStackControlPlane CR to "1":
----
oc -n openstack patch OpenStackControlPlane overcloud --type json -p '[{"op": "replace", "path":"/spec/virtualMachineRoles/controller/roleCount", "value": 1}]'
.. Ensure that the openstackclient pod is running on the same OCP nodes as the remaining controller VM. If its not on the same node, then move it by cordoning off the two nodes that have been freed up for RHOSO and deleting the openstackclient pod so that it gets rescheduled on the OCP node that has the remaining controller VM. Once the pod has moved to the correct node, uncordon all nodes.
----
oc adm cordon $OSP18_NODE1
oc adm cordon $OSP18_NODE2
oc delete pod openstackclient
oc adm uncordon $OSP18_NODE1
oc adm uncordon $OSP18_NODE2
----
.. Reduce the `roleCount` for the Controller role in the `OpenStackControlPlane` CR to "1":
+
----
$ oc -n openstack patch OpenStackControlPlane overcloud --type json -p '[{"op": "replace", "path":"/spec/virtualMachineRoles/controller/roleCount", "value": 1}]'
.. Ensure that the `OpenStackClient` pod is running on the same {OpenShiftShort} nodes as the remaining Controller VM. If the `OpenStackClient` pod is not on the same node, then move it by cordoning off the two nodes that have been freed up for {rhos_acro}. Then you delete the `OpenStackClient` pod so that it gets rescheduled on the {OpenShiftShort} node that has the remaining Controller VM. After the pod is moved to the correct node, uncordon all the nodes:
+
----
$ oc adm cordon $OSP18_NODE1
$ oc adm cordon $OSP18_NODE2
$ oc delete pod openstackclient
$ oc adm uncordon $OSP18_NODE1
$ oc adm uncordon $OSP18_NODE2
----

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -62,3 +62,7 @@ consumed and are not available for the new control plane services until the adop

. Repeat this procedure for each isolated network and each host in the
configuration.

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment about the ifeval.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Comment on lines 67 to 68
For Director Operator network configurations please consult the documentation.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[creating-networks-with-director-operator].
endif::[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
For Director Operator network configurations please consult the documentation.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[creating-networks-with-director-operator].
endif::[]
For more information about director Operator network configurations, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[Creating networks with director Operator] in _Deploying an overcloud in a Red Hat OpenShift Container Platform cluster with director Operator_.
endif::[]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -38,6 +38,10 @@ network_config:
+
Repeat this configuration for other networks that need to use different subnets for the new and existing parts of the deployment.

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment about ifeval.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@@ -38,6 +38,10 @@ network_config:
+
Repeat this configuration for other networks that need to use different subnets for the new and existing parts of the deployment.

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
For Director Operator network configurations please consult the documentation.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[creating-networks-with-director-operator].
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
For Director Operator network configurations please consult the documentation.For more information, see link :https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[creating-networks-with-director-operator].
For more information about director Operator network configurations, see link:https://docs.redhat.com/en/documentation/red_hat_openstack_platform/17.1/html-single/deploying_an_overcloud_in_a_red_hat_openshift_container_platform_cluster_with_director_operator/index#assembly_creating-networks-with-director-operator[Creating networks with director Operator] in _Deploying an overcloud in a Red Hat OpenShift Container Platform cluster with director Operator_.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@pinikomarov pinikomarov force-pushed the ospdo_adoption_docs_requested_changes branch 3 times, most recently from 2167362 to 6b6232e Compare March 2, 2025 10:54
@klgill klgill mentioned this pull request Mar 6, 2025
@pinikomarov pinikomarov force-pushed the ospdo_adoption_docs_requested_changes branch from 6b6232e to 8c7e89c Compare March 6, 2025 23:07
@pinikomarov pinikomarov marked this pull request as ready for review March 6, 2025 23:08
Copy link
Contributor

@klgill klgill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pinikomarov Please review and commit my suggestions.
A general comment about this doc: The formatting in the OSPdO preview is scrambled. I think the problem is occurring because some procedures have :leveloffset: variables at the top of the file. For example:

:leveloffset: 2

:leveloffset: +1

I think these variables need to be removed, and then we can check the formatting again after.

https://logserver.rdoproject.org/15/815/8c7e89c23c26ac8b710a03240532a8e054331d86/github-check/adoption-docs-preview/4437241/docs_build/docs_build/adoption-user/index-downstream-ospdo.html

@@ -24,7 +24,7 @@ The following features are considered a Technology Preview and have not been tes
** AMD SEV
** Direct download from Rados Block Device (RBD)
** File-backed memory
** `Provider.yaml`
** Multipule data plane node sets
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
** Multipule data plane node sets
** Multiple data plane node sets

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

. xref:migrating-tls-everywhere_configuring-network[Migrate TLS everywhere (TLS-e) to the Red Hat OpenStack Services on OpenShift (RHOSO) deployment].
. xref:migrating-databases-to-the-control-plane_configuring-network[Migrate your existing databases to the new control plane].
. xref:adopting-openstack-control-plane-services_configuring-network[Adopt your Red Hat OpenStack Platform 17.1 control plane services to the new RHOSO 18.0 deployment].
ifeval::["{build_variant}" == "ospdo"]
. xref:ospdo_scale_down_pre_database_adoption_[Scaling down director Operator resources].
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The xref for the "Scaling down" module is missing a context variable. I will investigate what that should be.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -4,6 +4,11 @@

To help you manage the configuration for your {OpenStackPreviousInstaller} and {rhos_prev_long} ({OpenStackShort}) services, you can compare the configuration files between your {OpenStackPreviousInstaller} deployment and the {rhos_long} cloud by using the os-diff tool.

ifeval::["{build}-{build_variant}" == "downstream-ospdo"]
[NOTE]
At this time os-diff does not support director Operator.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wasn't this change committed?

@@ -8,7 +8,6 @@ ifdef::context[:parent-context: {context}]

Adopting the {rhos_long} data plane involves the following steps:

. Stop any remaining services on the {rhos_prev_long} ({OpenStackShort}) {rhos_prev_ver} control plane.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this line be deleted for both ospdo and regular adoption?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because with OSPdO this was already executed before:
"This step has already been executed in the chapter / section on "Scaling down director Operator resources", since it needed to be executed before we deleted the controller VM"
see https://docs.google.com/document/d/1jVrPHxzelwaxmUGOLscNiE8_yaezz1aOz4GWYm2D8b4/edit?disco=AAABb99dPZA

Comment on lines 215 to 258
. Create Libvirt secret:
----
+
echo "Create libvirt secret"
LIBVIRT_PASSWORD=$(grep <"${PASSWORD_FILE}" ' LibvirtTLSPassword:' | awk -F ': ' '{ print $2; }')

oc apply -f - <<EOF
apiVersion: v1
data:
LibvirtPassword: $(echo -n "${LIBVIRT_PASSWORD}" | base64)
kind: Secret
metadata:
name: libvirt-secret
namespace: ${RHOSO18_NAMESPACE}
type: Opaque
EOF
----
+
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
. Create Libvirt secret:
----
+
echo "Create libvirt secret"
LIBVIRT_PASSWORD=$(grep <"${PASSWORD_FILE}" ' LibvirtTLSPassword:' | awk -F ': ' '{ print $2; }')
oc apply -f - <<EOF
apiVersion: v1
data:
LibvirtPassword: $(echo -n "${LIBVIRT_PASSWORD}" | base64)
kind: Secret
metadata:
name: libvirt-secret
namespace: ${RHOSO18_NAMESPACE}
type: Opaque
EOF
----
+
. Create the libvirt secret:
+
----
$ echo "Create libvirt secret"
LIBVIRT_PASSWORD=$(grep <"${PASSWORD_FILE}" ' LibvirtTLSPassword:' | awk -F ': ' '{ print $2; }')
oc apply -f - <<EOF
apiVersion: v1
data:
LibvirtPassword: $(echo -n "${LIBVIRT_PASSWORD}" | base64)
kind: Secret
metadata:
name: libvirt-secret
namespace: ${RHOSO18_NAMESPACE}
type: Opaque
EOF
----

Should there be a space between the following lines? And is oc apply indented too far?

LIBVIRT_PASSWORD=$(grep <"${PASSWORD_FILE}" ' LibvirtTLSPassword:' | awk -F ': ' '{ print $2; }')

    oc apply -f - <<EOF

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no space needed for the first line (all part of the libvirt_pass variable)
corrected the oc indent

@@ -76,6 +76,32 @@ $CONTROLLER1_SSH sudo systemctl restart corosync
$CONTROLLER1_SSH sudo pcs cluster stop
$CONTROLLER1_SSH sudo pcs cluster start
----

.. Check if only controller-0 is started and the other 2 controllers are stopped:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please commit this suggestion.

Comment on lines 84 to 88
.. Check if the openstack control plane is still operational: (May need to wait few minutes for the control plane to get operational. The control plane response will get slow after this point).
----
$OS_CLIENT openstack compute service list
----
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please commit this suggestion. The step order is wrong in the preview.

Comment on lines 88 to 97
.. Once pacemaker is only managing one of the controllers, we can delete 2 of the controller VMs:
Annotate controller-1 and controller-2 VMs for deletion:
----
oc -n openstack annotate vm controller-1 osp-director.openstack.org/delete-host=true
oc -n openstack annotate vm controller-2 osp-director.openstack.org/delete-host=true
----
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please commit this suggestion.

oc -n openstack annotate vm controller-1 osp-director.openstack.org/delete-host=true
oc -n openstack annotate vm controller-2 osp-director.openstack.org/delete-host=true
----
.. Reduce the `roleCount` for the Controller role in the `OpenStackControlPlane` CR to "1":
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
.. Reduce the `roleCount` for the Controller role in the `OpenStackControlPlane` CR to "1":
.. Reduce the `roleCount` for the Controller role in the `OpenStackControlPlane` CR to `1`:

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Comment on lines 30 to 34
openstack server list --all-projects -c ID -c Status |grep -E '\| .+ing \|'
openstack volume list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
openstack volume backup list --all-projects -c ID -c Status |grep -E '\| .+ing \|' | grep -vi error
openstack share list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
openstack image list -c ID -c Status |grep -E '\| .+ing \|'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
openstack server list --all-projects -c ID -c Status |grep -E '\| .+ing \|'
openstack volume list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
openstack volume backup list --all-projects -c ID -c Status |grep -E '\| .+ing \|' | grep -vi error
openstack share list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
openstack image list -c ID -c Status |grep -E '\| .+ing \|'
$ openstack server list --all-projects -c ID -c Status |grep -E '\| .+ing \|'
$ openstack volume list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
$ openstack volume backup list --all-projects -c ID -c Status |grep -E '\| .+ing \|' | grep -vi error
$ openstack share list --all-projects -c ID -c Status |grep -E '\| .+ing \|'| grep -vi error
$ openstack image list -c ID -c Status |grep -E '\| .+ing \|'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@pinikomarov pinikomarov force-pushed the ospdo_adoption_docs_requested_changes branch from 8c7e89c to 2c28d95 Compare March 9, 2025 15:48
Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/data-plane-adoption for 815,2c28d95c6acb6572b4c196da0a8ac7b5e0998e95

@pinikomarov pinikomarov force-pushed the ospdo_adoption_docs_requested_changes branch from 2c28d95 to f36eec5 Compare March 9, 2025 15:55
Copy link
Contributor

@jistr jistr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a first round of comments, i'll need to do another pass outside of meeting times.

@@ -110,6 +110,7 @@ apiVersion: core.openstack.org/v1beta1
kind: OpenStackVersion
metadata:
name: openstack
namespace: $RHOSO18_NAMESPACE
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regarding the RHOSO18_NAMESPACE:

  • This variable does not exist outside the OSPDO guide, we can't just start using it like this in blocks which aren't specific to OSPDO. We'll have to define it.

  • I'm not strictly against namespace-parametrizing everything, i think we preliminarily discussed doing so last year, but let's sync on this with more reviewers because this is a big step. cc @ciecierski @holser @bogdando

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Also i'm not sure why we call it RHOSO18_NAMESPACE instead of just RHOSO_NAMESPACE but that's a minor thing.)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use default for rhoso
oc project rhoso_namespace (openstack)
then leave the "-n NS" blank - also should work for CRs
then use -n ospdo for ospdo related things

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CONTROLLER1_SSH="ssh -i *<path to SSH key>* root@*<controller-1 IP>*" <1>
CONTROLLER2_SSH="ssh -i *<path to SSH key>* root@*<controller-2 IP>*"
CONTROLLER3_SSH="ssh -i *<path to SSH key>* root@*<controller-3 IP>*"
$CONTROLLER1_SSH="ssh -i *<path to SSH key>* root@*<controller-1 IP>*" <1>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is undoing 3-controller instructions.

endif::[]
----
* Specify the IP addresses of all Controller nodes, for example:
+
[subs=+quotes]
----
ifeval::["{build}" != "downstream"]
CONTROLLER1_SSH="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected]"
$CONTROLLER1_SSH="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa [email protected]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this change?

endif::[]
ifeval::["{build_variant}" == "ospdo"]
for i in {1..3}; do
SSH_CMD=CONTROLLER_SSH
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SSH 3 times to the same controller?

ifeval::["{build_variant}" != "ospdo"]
for i in {1..3}; do
SSH_CMD=CONTROLLER${i}_SSH
endif::[]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This beaks visual indent it seems.

@@ -240,6 +237,27 @@ EOF
+
The resources in the `ConfigMap` contain cell-specific configurations.

ifeval::["{build_variant}" == "ospdo"]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we use the instructions above for creating the libvirt secret?

@@ -52,7 +68,12 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: ovn-data-cert
ifeval::["{build_variant}" != "ospdo"]
namespace: openstack
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some uses of openstack namespace are parametrized while others are hardcoded. We should be consistent.

@openshift-merge-robot
Copy link

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

export CONTROLLER3_SSH=
export $CONTROLLER1_SSH="oc -n $OSPDO_NAMESPACE rsh -c openstackclient openstackclient ssh controller-0.ctlplane"
export $CONTROLLER2_SSH="oc -n $OSPDO_NAMESPACE rsh -c openstackclient openstackclient ssh controller-1.ctlplane"
export $CONTROLLER3_SSH="oc -n $OSPDO_NAMESPACE rsh -c openstackclient openstackclient ssh controller-2.ctlplane"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the review call -- this looks unintended too.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants