diff --git a/Makefile b/Makefile index 7fa74d09a..236c280ab 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,7 @@ docs: docs-dependencies docs-user-all-variants docs-dev ## Build documentation docs-user-all-variants: cd docs_user; BUILD=upstream $(MAKE) html cd docs_user; BUILD=downstream $(MAKE) html + cd docs_user; BUILD=downstream BUILD_VARIANT=ospdo $(MAKE) html docs-user: cd docs_user; $(MAKE) html diff --git a/docs_user/Makefile b/docs_user/Makefile index f5b32ec5d..2d5679fc2 100644 --- a/docs_user/Makefile +++ b/docs_user/Makefile @@ -1,10 +1,12 @@ BUILD ?= upstream +ABUILD_VARIANT ?= +BUILD_VARIANT_WITH_SEPARATOR ?= $(if $(strip $(BUILD_VARIANT)),-$(BUILD_VARIANT),) BUILD_DIR = ../docs_build ROOTDIR = $(realpath .) NAME = adoption-user DEST_DIR = $(BUILD_DIR)/$(NAME) -DEST_HTML = $(DEST_DIR)/index-$(BUILD).html -DEST_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD).pdf +DEST_HTML = $(DEST_DIR)/index-$(BUILD)$(BUILD_VARIANT_WITH_SEPARATOR).html +DEST_PDF = $(BUILD_DIR)/$(NAME)-$(BUILD)$(BUILD_VARIANT_WITH_SEPARATOR).pdf IMAGES_DIR = $(DEST_DIR)/images IMAGES_TS = $(DEST_DIR)/.timestamp-images MAIN_SOURCE = main.adoc @@ -45,7 +47,7 @@ watch-html: $(MAKE) html; \ done -open-html: html +open-html: htmlf ${BROWSER_OPEN} "file://$(realpath $(ROOTDIR)/$(DEST_HTML))" open-pdf: pdf @@ -56,7 +58,7 @@ $(IMAGES_TS): $(IMAGES) touch $(IMAGES_TS) $(DEST_HTML): $(ALL_SOURCES) - $(BUNDLE_EXEC) asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -b xhtml5 -d book -o $@ $(MAIN_SOURCE) + $(BUNDLE_EXEC) asciidoctor -a source-highlighter=highlightjs -a highlightjs-languages="yaml,bash" -a highlightjs-theme="monokai" --failure-level WARN -a build=$(BUILD) -a build_variant=$(BUILD_VARIANT) -b xhtml5 -d book -o $@ $(MAIN_SOURCE) $(DEST_PDF): $(ALL_SOURCES) - $(BUNDLE_EXEC) asciidoctor-pdf -a build=$(BUILD) -d book -o $@ $(MAIN_SOURCE) $(IMAGES) + $(BUNDLE_EXEC) asciidoctor-pdf -a build=$(BUILD) -a build_variant=$(BUILD_VARIANT) -d book -o $@ $(MAIN_SOURCE) $(IMAGES) diff --git a/docs_user/adoption-attributes.adoc b/docs_user/adoption-attributes.adoc index 73277a3c9..ff11e5c11 100644 --- a/docs_user/adoption-attributes.adoc +++ b/docs_user/adoption-attributes.adoc @@ -149,6 +149,11 @@ ifeval::["{build}" == "downstream"] :telemetry: Telemetry service endif::[] +ifeval::["{build}-{build_variant}" == "downstream-ospdo"] +:OpenStackPreviousInstaller: director Operator +endif::[] + + // Common URLs. Do not override. Do not delete. :base_url: https://access.redhat.com/documentation :defaultURL: https://docs.redhat.com/en/documentation/red_hat_openstack_services_on_openshift/{rhos_curr_ver}/html diff --git a/docs_user/modules/assembly_ospdo-scale-down-pre-database-adoption.adoc b/docs_user/assemblies/assembly_ospdo-scale-down-pre-database-adoption.adoc similarity index 100% rename from docs_user/modules/assembly_ospdo-scale-down-pre-database-adoption.adoc rename to docs_user/assemblies/assembly_ospdo-scale-down-pre-database-adoption.adoc diff --git a/docs_user/assemblies/assembly_prepare_director_operator_and_rhoso_for_adoption_process.adoc b/docs_user/assemblies/assembly_prepare-director-operator-and-rhoso-for-adoption-process.adoc similarity index 99% rename from docs_user/assemblies/assembly_prepare_director_operator_and_rhoso_for_adoption_process.adoc rename to docs_user/assemblies/assembly_prepare-director-operator-and-rhoso-for-adoption-process.adoc index a110d8c66..7ec1b0642 100644 --- a/docs_user/assemblies/assembly_prepare_director_operator_and_rhoso_for_adoption_process.adoc +++ b/docs_user/assemblies/assembly_prepare-director-operator-and-rhoso-for-adoption-process.adoc @@ -23,6 +23,7 @@ $ oc project openstack ---- . Define the common environment variables: ++ ---- export PASSWORD_FILE="tripleo-passwords.yaml" diff --git a/docs_user/main.adoc b/docs_user/main.adoc index 647ca7628..3decdbaf9 100644 --- a/docs_user/main.adoc +++ b/docs_user/main.adoc @@ -11,15 +11,15 @@ include::adoption-attributes.adoc[] include::assemblies/assembly_rhoso-180-adoption-overview.adoc[leveloffset=+1] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] -include::assemblies/assembly_prepare_director_operator_for_adoption_process.adoc[leveloffset=+1] +ifeval::["{build_variant}" == "ospdo"] +include::assemblies/assembly_prepare-director-operator-and-rhoso-for-adoption-process.adoc[leveloffset=+1] endif::[] include::modules/proc_migrating-tls-everywhere.adoc[leveloffset=+1] include::assemblies/assembly_migrating-databases-to-the-control-plane.adoc[leveloffset=+1] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] include::assemblies/assembly_ospdo-scale-down-pre-database-adoption.adoc[leveloffset=+1] endif::[] diff --git a/docs_user/modules/con_troubleshooting-object-storage-migration.adoc b/docs_user/modules/con_troubleshooting-object-storage-migration.adoc index 1c0919bfb..abd8b2230 100644 --- a/docs_user/modules/con_troubleshooting-object-storage-migration.adoc +++ b/docs_user/modules/con_troubleshooting-object-storage-migration.adoc @@ -30,11 +30,9 @@ $ oc debug --keep-labels=true job/swift-ring-rebalance -- /bin/sh -c 'swift-ring The output might show a md5 mismatch until approximately 2 minutes after pushing the new rings. After the 2 minutes, the output looks similar to the following example: + ---- -[...] Oldest completion was 2024-03-14 16:53:27 (3 minutes ago) by 172.20.0.100:6000. Most recent completion was 2024-03-14 16:56:38 (12 seconds ago) by swift-storage-0.swift-storage.openstack.svc:6200. =============================================================================== [2024-03-14 16:56:50] Checking ring md5sums 4/4 hosts matched, 0 error[s] while checking hosts. -[...] ---- diff --git a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc index a0bcb5cfd..4fc90832a 100644 --- a/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc +++ b/docs_user/modules/proc_adopting-compute-services-to-the-data-plane.adoc @@ -126,8 +126,8 @@ endif::[] ifeval::["{build}" == "downstream"] $(cat | base64 | sed \'s/^/ /') endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] - $(oc exec -n $ -t openstackclient openstackclient -- cat /home/cloud-admin/.ssh/id_rsa | base64 | sed 's/^/ /') +ifeval::["{build_variant}" == "ospdo"] + $(oc exec -n $ -t openstackclient openstackclient -- cat /home/cloud-admin/.ssh/id_rsa | base64 | sed \'s/^/ /') endif::[] EOF ---- diff --git a/docs_user/modules/proc_adopting-image-service-with-nfs-backend.adoc b/docs_user/modules/proc_adopting-image-service-with-nfs-backend.adoc index 7b35b5346..e22df18e4 100644 --- a/docs_user/modules/proc_adopting-image-service-with-nfs-backend.adoc +++ b/docs_user/modules/proc_adopting-image-service-with-nfs-backend.adoc @@ -130,7 +130,6 @@ $ oc patch openstackcontrolplane openstack --type=merge --patch-file glance_nfs_ $ oc get pods -l service=glance NAME READY STATUS RESTARTS glance-default-single-0 3/3 Running 0 -``` ---- * Ensure that the description of the pod reports the following output: diff --git a/docs_user/modules/proc_deploying-backend-services.adoc b/docs_user/modules/proc_deploying-backend-services.adoc index e1e43f8bf..5d6f8688a 100644 --- a/docs_user/modules/proc_deploying-backend-services.adoc +++ b/docs_user/modules/proc_deploying-backend-services.adoc @@ -113,7 +113,8 @@ make input ---- endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] ++ ---- $ oc get secret tripleo-passwords -o jsonpath='{.data.*}' | base64 -d>~/tripleo-standalone-passwords.yaml ---- @@ -208,7 +209,12 @@ metadata: name: openstack spec: secret: osp-secret +ifeval::["{build_variant}" != "ospdo"] storageClass: local-storage <1> +endif::[] +ifeval::["{build_variant}" == "ospdo"] + storageClass: <1> +endif::[] barbican: enabled: false @@ -231,16 +237,16 @@ spec: service: metadata: annotations: -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] metallb.universe.tf/address-pool: ctlplane metallb.universe.tf/allow-shared-ip: ctlplane metallb.universe.tf/loadBalancerIPs: 192.168.122.80 endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] - metallb.universe.tf/address-pool: - metallb.universe.tf/allow-shared-ip: - metallb.universe.tf/loadBalancerIPs: +ifeval::["{build_variant}" == "ospdo"] + metallb.universe.tf/address-pool: <2> + metallb.universe.tf/allow-shared-ip: <2> + metallb.universe.tf/loadBalancerIPs: <3> endif::[] spec: type: LoadBalancer @@ -312,7 +318,7 @@ endif::[] ovn: enabled: false template: -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] ovnController: networkAttachment: tenant nodeSelector: @@ -327,7 +333,7 @@ ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] dbType: SB networkAttachment: internalapi endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] ovnController: networkAttachment: tenant nodeSelector: @@ -337,10 +343,10 @@ ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] ovnDBCluster: ovndbcluster-nb: dbType: NB - networkAttachment: + networkAttachment: <4> ovndbcluster-sb: dbType: SB - networkAttachment: + networkAttachment: <4> endif::[] placement: enabled: false @@ -362,13 +368,13 @@ endif::[] service: metadata: annotations: -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] metallb.universe.tf/address-pool: internalapi metallb.universe.tf/loadBalancerIPs: 172.17.0.86 endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] - metallb.universe.tf/address-pool: - metallb.universe.tf/loadBalancerIPs: +ifeval::["{build_variant}" == "ospdo"] + metallb.universe.tf/address-pool: <4> + metallb.universe.tf/loadBalancerIPs: <3> endif::[] spec: type: LoadBalancer @@ -387,14 +393,15 @@ endif::[] replicas: 1 EOF ---- -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] -* Replace with the name of your network definition. -* Replace with the LoadBalancer IP address. -* Replace with the name of your network. -endif::[] +ifeval::["{build_variant}" == "ospdo"] + -<1> Select an existing storage class in your {OpenShiftShort} cluster. +<1> Select an existing ``` in your {OpenShiftShort} cluster. +<2> Replace `` with the name of your network definition. +<3> Replace `` with the LoadBalancer IP address. +<4> Replace `` with the name of your network. + +endif::[] .Verification diff --git a/docs_user/modules/proc_deploying-file-systems-service-control-plane.adoc b/docs_user/modules/proc_deploying-file-systems-service-control-plane.adoc index 5502d4421..4c2c76069 100644 --- a/docs_user/modules/proc_deploying-file-systems-service-control-plane.adoc +++ b/docs_user/modules/proc_deploying-file-systems-service-control-plane.adoc @@ -20,15 +20,17 @@ ifeval::["{build}" != "downstream"] defined] already. Replace the following example values with values that are correct for your environment: + ---- -CONTROLLER1_SSH="ssh -i root@" +$ CONTROLLER1_SSH="ssh -i root@" ---- ++ endif::[] ifeval::["{build}" != "upstream"] * The `CONTROLLER1_SSH` environment variable is defined and points to the {OpenStackShort} Controller node. Replace the following example values with values that are correct for your environment: + ---- -CONTROLLER1_SSH="ssh -i root@" +$ CONTROLLER1_SSH="ssh -i root@" ---- ++ endif::[] .Procedure diff --git a/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc b/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc index 54775f1e6..19afaec68 100644 --- a/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc +++ b/docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc @@ -172,10 +172,10 @@ EOF . Restore the databases from `.sql` files into the control plane MariaDB: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] $ oc rsh mariadb-copy-data << EOF endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] $ oc rsh -n $OSPDO_NAMESPACE mariadb-copy-data << EOF endif::[] # db schemas to rename on import diff --git a/docs_user/modules/proc_migrating-ovn-data.adoc b/docs_user/modules/proc_migrating-ovn-data.adoc index 92511a1f3..1c6eee0b9 100644 --- a/docs_user/modules/proc_migrating-ovn-data.adoc +++ b/docs_user/modules/proc_migrating-ovn-data.adoc @@ -33,14 +33,12 @@ $ grep -rI 'ovn_[ns]b_conn' /var/lib/config-data/puppet-generated/ ---- .Procedure -+ -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] -. Get the {OpenShiftShort} master node that contains the {OpenStackShort} Controller: +ifeval::["{build_variant}" == "ospdo"] +. Get the {OpenShiftShort} master node that contains the {OpenStackShort} Controller node: + ---- $ oc get vmi -n $ -o jsonpath='{.items[0].metadata.labels.kubevirt\.io/nodeName}' ---- -+ * Replace `` with your OSPdO namespace. endif::[] . Prepare a temporary `PersistentVolume` claim and the helper pod for the OVN backup. Adjust the storage requests for a large database, if needed: @@ -63,7 +61,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] namespace: $OSPDO_NAMESPACE endif::[] name: ovn-data @@ -81,20 +79,20 @@ metadata: name: ovn-copy-data annotations: openshift.io/scc: anyuid -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] k8s.v1.cni.cncf.io/networks: internalapi endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] '[{"name": "internalapi-static", "namespace": $, "ips": [""]}]' endif::[] labels: app: adoption -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] namespace: $OSPDO_NAMESPACE endif::[] spec: -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] - nodeName: '{{ }}' +ifeval::["{build_variant}" == "ospdo"] + nodeName: '{{ }}' <1> endif::[] containers: - image: $OVSDB_IMAGE @@ -122,18 +120,17 @@ endif::[] secretName: ovn-data-cert EOF ---- -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] -+ -* Replace `` with the {OpenStackShort} node that contains the Controller. +ifeval::["{build_variant}" == "ospdo"] ++ <1> Replace `` with the {OpenStackShort} node that contains the Controller node. endif::[] . Wait for the pod to be ready: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] $ oc wait --for=condition=Ready pod/ovn-copy-data --timeout=30s endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] $ oc wait --for=condition=Ready -n $OSPDO_NAMESPACE pod/ovn-copy-data --timeout=30s endif::[] ---- @@ -149,15 +146,16 @@ $ $CONTROLLER1_SSH sudo iptables -I INPUT -s {PODIFIED_INTERNALAPI_NETWORK} -p t * If you did not enable TLS everywhere, run the following command: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] $ oc exec ovn-copy-data -- bash -c "ovsdb-client backup tcp:$SOURCE_OVSDB_IP:6641 > /backup/ovs-nb.db" $ oc exec ovn-copy-data -- bash -c "ovsdb-client backup tcp:$SOURCE_OVSDB_IP:6642 > /backup/ovs-sb.db" endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] $ oc exec -n $OSPDO_NAMESPACE ovn-copy-data -- bash -c "ovsdb-client backup tcp:$SOURCE_OVSDB_IP:6641 > /backup/ovs-nb.db" $ oc exec -n $OSPDO_NAMESPACE ovn-copy-data -- bash -c "ovsdb-client backup tcp:$SOURCE_OVSDB_IP:6642 > /backup/ovs-sb.db" endif::[] ---- ++ * If you enabled TLS everywhere, run the following command: + ---- @@ -205,7 +203,7 @@ PODIFIED_OVSDB_NB_IP=$(oc get svc --selector "statefulset.kubernetes.io/pod-name PODIFIED_OVSDB_SB_IP=$(oc get svc --selector "statefulset.kubernetes.io/pod-name=ovsdbserver-sb-0" -ojsonpath='{.items[0].spec.clusterIP}') ---- -.+ When using IPv6, adjust the address to the format expected by `ovsdb-*` tools: +. If you are using IPv6, adjust the address to the format expected by `ovsdb-*` tools: ---- PODIFIED_OVSDB_NB_IP=[$PODIFIED_OVSDB_NB_IP] @@ -231,11 +229,11 @@ $ oc exec ovn-copy-data -- bash -c "ovsdb-client get-schema --ca-cert=/etc/pki/t .. If you did not enable TLS everywhere, use the following command: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] $ oc exec ovn-copy-data -- bash -c "ovsdb-client restore tcp:$PODIFIED_OVSDB_NB_IP:6641 < /backup/ovs-nb.db" $ oc exec ovn-copy-data -- bash -c "ovsdb-client restore tcp:$PODIFIED_OVSDB_SB_IP:6642 < /backup/ovs-sb.db" endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] $ oc exec -n $RHOSO_NAMESPACE ovn-copy-data -- bash -c "ovsdb-client restore tcp:$PODIFIED_OVSDB_NB_IP:6641 < /backup/ovs-nb.db" $ oc exec -n $RHOSO_NAMESPACE ovn-copy-data -- bash -c "ovsdb-client restore tcp:$PODIFIED_OVSDB_SB_IP:6642 < /backup/ovs-sb.db" endif::[] diff --git a/docs_user/modules/proc_migrating-tls-everywhere.adoc b/docs_user/modules/proc_migrating-tls-everywhere.adoc index 1e66d6464..4d2d902f2 100644 --- a/docs_user/modules/proc_migrating-tls-everywhere.adoc +++ b/docs_user/modules/proc_migrating-tls-everywhere.adoc @@ -39,15 +39,15 @@ endif::[] . To locate the CA certificate and key, list all the certificates inside your NSSDB: + -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] -To locate the CA certificate and key, list all the certificates inside your NSSDB. If you installed OSPdO by using director-dev-tools, the server host runs the freeipa server as a container: +ifeval::["{build_variant}" == "ospdo"] +If you installed OSPdO by using director-dev-tools, the server host runs the freeipa server as a container: + ---- $ IPA_SSH="podman exec -ti freeipa-server" ---- endif::[] ---- -$IPA_SSH certutil -L -d /etc/pki/pki-tomcat/alias +$ IPA_SSH certutil -L -d /etc/pki/pki-tomcat/alias ---- + * The `-L` option lists all certificates. diff --git a/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc b/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc index 8fa1c2707..2570158c3 100644 --- a/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc +++ b/docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc @@ -12,12 +12,14 @@ Before you migrate your databases to the {rhos_long} control plane, retrieve the * Define the following shell variables. Replace the example values with values that are correct for your environment: + +ifeval::["{build_variant}" == "ospdo"] ++ ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] -ifeval::["{build}" != "downstream"] CONTROLLER1_SSH="ssh -i ~/install_yamls/out/edpm/ansibleee-ssh-key-id_rsa root@192.168.122.100" MARIADB_IMAGE=quay.io/podified-antelope-centos9/openstack-mariadb:current-podified +---- endif::[] +---- ifeval::["{build}" == "downstream"] CONTROLLER1_SSH="ssh -i ** root@**" MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.0 @@ -43,16 +45,16 @@ $ sudo grep -rI 'listen mysql' -A10 /var/lib/config-data/puppet-generated/ | gre . Export the shell variables for the following outputs and test the connection to the {OpenStackShort} database: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] export PULL_OPENSTACK_CONFIGURATION_DATABASES=$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] export PULL_OPENSTACK_CONFIGURATION_DATABASES=$(oc run mariadb-client --overrides="$RUN_OVERRIDES" -n $OSPDO_NAMESPACE -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] mysql -rsh "$SOURCE_MARIADB_IP" -uroot -p"$SOURCE_DB_ROOT_PASSWORD" -e 'SHOW databases;') echo "$PULL_OPENSTACK_CONFIGURATION_DATABASES" ---- -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] ---- export CONTROLLER1_SSH="oc -n $OSPDO_NAMESPACE rsh -c openstackclient openstackclient ssh controller-0.ctlplane" ---- @@ -84,9 +86,9 @@ $ export SOURCE_DB_ROOT_PASSWORD=$(grep <"${PASSWORD_FILE}" ' MysqlRootPassword: ---- $ cpexport=$(oc -n "${OSPDO_NAMESPACE}" get cm tripleo-exports-default -o json | jq -r '.data["ctlplane-export.yaml"]') $ export SOURCE_MARIADB_IP=$(echo "$cpexport" | sed -e '0,/ MysqlInternal/d' | sed -n '0,/host_nobrackets/s/^.*host_nobrackets\:\s*\(.*\)$/\1/p') -+ + $ export MARIADB_IMAGE='quay.io/podified-antelope-centos9/openstack-mariadb:current-podified' -+ + $ RUN_OVERRIDES='{ "apiVersion": "v1", "metadata": { @@ -125,10 +127,10 @@ The `nova`, `nova_api`, and `nova_cell0` databases are included in the same data . Run `mysqlcheck` on the {OpenStackShort} database to check for inaccuracies: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] export PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK=$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] export PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK=$(oc run mariadb-client --overrides="$RUN_OVERRIDES" -n $OSPDO_NAMESPACE -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] mysqlcheck --all-databases -h $SOURCE_MARIADB_IP -u root -p"$SOURCE_DB_ROOT_PASSWORD" | grep -v OK) @@ -138,10 +140,10 @@ echo "$PULL_OPENSTACK_CONFIGURATION_MYSQLCHECK_NOK" . Get the {compute_service_first_ref} cell mappings: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] export PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS=$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] export PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS=$(oc run mariadb-client --overrides="$RUN_OVERRIDES" -n $OSPDO_NAMESPACE -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] mysql -rsh "${SOURCE_MARIADB_IP}" -uroot -p"${SOURCE_DB_ROOT_PASSWORD}" nova_api -e \ @@ -152,10 +154,10 @@ echo "$PULL_OPENSTACK_CONFIGURATION_NOVADB_MAPPED_CELLS" . Get the hostnames of the registered Compute services: + ---- -ifeval::["{OpenStackPreviousInstaller}" != "director_operator"] +ifeval::["{build_variant}" != "ospdo"] export PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES=$(oc run mariadb-client ${MARIADB_CLIENT_ANNOTATIONS} -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] -ifeval::["{OpenStackPreviousInstaller}" == "director_operator"] +ifeval::["{build_variant}" == "ospdo"] export PULL_OPENSTACK_CONFIGURATION_NOVA_COMPUTE_HOSTNAMES=$(oc run mariadb-client --overrides="$RUN_OVERRIDES" -n $OSPDO_NAMESPACE -q --image ${MARIADB_IMAGE} -i --rm --restart=Never -- \ endif::[] mysql -rsh "$SOURCE_MARIADB_IP" -uroot -p"$SOURCE_DB_ROOT_PASSWORD" nova_api -e \