-
Notifications
You must be signed in to change notification settings - Fork 57
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
Multi cell database/mq adoption #746
base: main
Are you sure you want to change the base?
Multi cell database/mq adoption #746
Conversation
3323bbf
to
a1207eb
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/ff2fa0079d2d4d0f9d107db215021a87 ✔️ noop SUCCESS in 0s |
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
0ba8ce7
to
cd5b8f9
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/2bf5c26d9ce042488b038c87505a0f82 ✔️ noop SUCCESS in 0s |
c392e11
to
006e247
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/ef997d9bd22a422fa0a81831c10ce76f ✔️ noop SUCCESS in 0s |
006e247
to
55aec9f
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/221b8eaa480445db948ba454fc1dc6d9 ✔️ noop SUCCESS in 0s |
recheck |
55aec9f
to
ee3defd
Compare
This change depends on a change that failed to merge. Change https://review.rdoproject.org/r/c/rdo-jobs/+/53192 is needed. |
ee3defd
to
03ce37c
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/28720608befb44c49d0f76f95466684b ✔️ noop SUCCESS in 0s |
505e4e8
to
8d81b48
Compare
tests/roles/backend_services/templates/openstack_control_plane.j2
Outdated
Show resolved
Hide resolved
tests/roles/backend_services/templates/openstack_control_plane.j2
Outdated
Show resolved
Hide resolved
MARIADB_IMAGE=registry.redhat.io/rhosp-dev-preview/openstack-mariadb-rhel9:18.0 | ||
endif::[] | ||
SOURCE_MARIADB_IP=172.17.0.2 | ||
$ PASSWORD_FILE="$HOME/overcloud-passwords.yaml" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see how we match this procedure's commands in docs with those in tests https://github.com/openstack-k8s-operators/data-plane-adoption/pull/746/files#diff-50c1d11b8d50eb791a57420a1cb81ce7bce10dee4ec137c139146ade1ca9dc57R27
8d81b48
to
cdff544
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/513df93417f943f8bc8b6d3849192150 ✔️ noop SUCCESS in 0s |
c1a9693
to
3b6c0c3
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/bb124871501c4f128f85c5ba04239944 ✔️ noop SUCCESS in 0s |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please review my comments and suggestions.
It would really help me to look at the downstream preview to check for any formatting issues.
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
docs_user/modules/proc_migrating-databases-to-mariadb-instances.adoc
Outdated
Show resolved
Hide resolved
$ chmod 0600 ~/.source_cloud_exported_variables* | ||
---- | ||
+ | ||
<1> If `neutron-sriov-nic-agent` agents are running in your {OpenStackShort} deployment, get the configuration to use for the data plane adoption |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<1> If `neutron-sriov-nic-agent` agents are running in your {OpenStackShort} deployment, get the configuration to use for the data plane adoption | |
<1> If `neutron-sriov-nic-agent` agents are running in your {OpenStackShort} deployment, get the configuration to use for the data plane adoption. |
Where do you get this configuration?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is probably a formatting change only, I was not introducing this statement in the 1st place, so I cannot answer to that question (@karelyatin perchance? we could address that improvement to SR-IOV adoption guide in follow up)
docs_user/modules/proc_retrieving-topology-specific-service-configuration.adoc
Outdated
Show resolved
Hide resolved
docs_user/modules/proc_stopping-infrastructure-management-and-compute-services.adoc
Outdated
Show resolved
Hide resolved
---- | ||
ifeval::["{build}" == "downstream"] | ||
<1> Replace `<path_to_SSH_key>` with the path to your SSH key. | ||
<2> Replace `<controller-X IP>` with IP addresses of all controllers. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<2> Replace `<controller-X IP>` with IP addresses of all controllers. | |
<2> Replace `<controller-1 IP>` with the IP addresses of all Controllers. |
The value to replace here should match the line of code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In code there is
ifeval::["{build}" == "downstream"]
CONTROLLER1_SSH="ssh -i *<path to SSH key>* root@*<controller-1 IP>*" <2>
CONTROLLER2_SSH="ssh -i *<path to SSH key>* root@*<controller-2 IP>*"
CONTROLLER3_SSH="ssh -i *<path to SSH key>* root@*<node3 IP>*"
# ...
endif::[]
isn't that matches to <controller-X IP>
(or shall we fix to node3?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@klgill sorry, I meant this renders OK for me
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I see. You used as a "catch-all" for each value.
Typically, our style is to list each env var. But you could probably simplify it by using only one bullet point, for example:
- Replace
<controller-1 IP>
,<controller-2 IP>
, and<node3 IP>
with the IP addresses of each Controller node.
3b6c0c3
to
658849b
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/813ed9ca7fb3499e9c8fedf30ef0f316 ✔️ noop SUCCESS in 0s |
7e46a13
to
8416c99
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/ac1f2c5cea9b4e63a9759e67b769b052 ✔️ noop SUCCESS in 0s |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct this variable is not used , I'm using "mysql_client_override" instead , supplied by the job definitions file from ci-fmw-jobs:
https://gitlab.cee.redhat.com/ci-framework/ci-framework-jobs/-/blob/main/playbooks/adoption/files/secrets_ospdo.j2?ref_type=heads#L24
Looks ok to me |
4315d24
to
9fffdb4
Compare
This change depends on a change that failed to merge. Change openstack-k8s-operators/install_yamls#985 is needed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see nothing that is clearly wrong in this change. But also I'm not comfortable to approve it as I lost in the scripts. Probably it is easier to review the result of the adoption to verify that this procedure is correct than looking at the procedure alone. If it the end result is a properly adopted DB then I'm OK to land this.
Provide a static multi-cell config for databases and messaging for adoption guide and tests, which comprises a 3 cells. Keep renaming 'default' cell consistent for single and multi cells: Default becomes cellX (or it can be imported as is, for a multi-cell case only) cell1 becomes mapped to openstack-cell1 osdp node set cell2 becomes mapped to openstack-cell2 osdp node set, etc. cellX (X=3 here) becomes mapped to openstack-cell3. Alternatively, default cell retains its name for the openstack-default osdpns mapping Evaluate podified MariaDB passwords for cells from osp-secret to align the tests with documented commands. Remove no longer needed podified DB password variable. Make ansible and shell variables compute cells aware. Rework vars and secrets YAML values for the source and edpm nodes to not confuse its different naming schemes for cells in OSP/TripleO and RHOSO. Remove cached fact for pulled OSP configuration as it can no longer be generated in a multi-cell setup, where related shell variables become bash arrays. Simplify ENV headers management by collecting in a single place. Adjust storage/storageRequests values to make it better fitting a multi-cell test scenarios. Also provide values in docs and add a comment to adjust them as needed. Remove source_db_root_password as it is directly evaluated from tripleo passwords into an env var. Run mysql commands in individual pods. Finished pods take time to terminate, avoid errors where consequent mysql commands failing because the old and new pod use the same name. Rename nodesets to openstack-cell1, which is needed for adoption of remaining multi-cell aware services in a follow up. Signed-off-by: Bohdan Dobrelia <[email protected]> Fix Signed-off-by: Bohdan Dobrelia <[email protected]>
Declare RUN_OVERRIDES before it is used. Use env vars instead of docs generation conditions to reuse the same code in tests: * Add MARIADB_RUN_OVERRIDES to cover all overrides and client annotations * Add missing definitions for rhoso/ospd namespace specific vars * Use env TRIPLEO_PASSWORDS for all cases as OSPDo still deploys tripleo * Define and use NAMESPACE (default openstack) instead of RHOSO18_NAMESPACE or OSPDO_NAMESPACE. Remove unused rhoso18 ns value (only in these guide). Signed-off-by: Bohdan Dobrelia <[email protected]>
Illustrate how commands in scripts could have comments that become (almost as is) native ascii docs foot-notes. When copying code into docs, the minimal adjustments will be needed, like adding '$' prefix (or '>' for multiline commands). Signed-off-by: Bohdan Dobrelia <[email protected]>
Those will be added back in a follow up, which completes the guide and tests for extra cell2 and cell3. Signed-off-by: Bohdan Dobrelia <[email protected]>
Assume a single cell1 yet. Remove edpm_computes and computes env var from tests as it is not multi-cell aware, and should be no longer needed. The docs still use that env var, it will be removed in multi-cell adoption follow up, where we also cover EDPM multi-cell adoption. This is required as rhe rdo-jobs dependency introduces that change for edpm_nodes and provides a common base for this and future multi-cell follow ups. Signed-off-by: Bohdan Dobrelia <[email protected]>
Signed-off-by: Bohdan Dobrelia <[email protected]>
Signed-off-by: Bohdan Dobrelia <[email protected]>
Co-authored-by: Katie Gilligan <[email protected]>
0945a95
to
84f57aa
Compare
Build failed (check pipeline). Post https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5285d7fd1fc94b238838ed4c2293032e ✔️ noop SUCCESS in 0s |
Declare RUN_OVERRIDES before it is used.
Use env vars instead of docs generation conditions to reuse the same
code in tests:
tripleo
RHOSO18_NAMESPACE or OSPDO_NAMESPACE. Remove unused rhoso18 ns value
(only in these guide).
Illustrate how commands in scripts could have comments
that become (almost as is) native ascii docs foot-notes.
When copying code into docs, the minimal adjustments will
be needed, like adding '$' prefix (or '>' for multiline commands).
Provide a static multi-cell config for databases and messaging
for adoption guide and tests, which comprises a 3 cells.
Default becomes cellX (or it can be imported as is, for a multi-cell
case only)
cell1 becomes mapped to openstack-cell1 osdp node set
cell2 becomes mapped to openstack-cell2 osdp node set, etc.
cellX (X=3 here) becomes mapped to openstack-cell3. Alternatively,
default cell retains its name for the openstack-default osdpns
mapping
Evaluate podified MariaDB passwords for cells from osp-secret
to align the tests with documented commands. Remove no longer
needed podified DB password variable.
Make ansible and shell variables compute cells aware.
Rework vars and secrets YAML values for the source and edpm
nodes to not confuse its different naming schemes for cells
in OSP/TripleO and RHOSO.
Remove cached fact for pulled OSP configuration as it can no longer
be generated in a multi-cell setup, where related shell variables
become bash arrays.
Simplify ENV headers management by collecting in a single place.
Adjust storage/storageRequests values to make it better fitting
a multi-cell test scenarios. Also provide values in docs and
add a comment to adjust them as needed.
Remove source_db_root_password as it is directly evaluated from
tripleo passwords into an env var.
Run mysql commands in individual pods.
Finished pods take time to terminate, avoid errors where
consequent mysql commands failing because the old and new pod use the
same name.
Rename nodesets to openstack-cell1, which is needed for adoption of
remaining multi-cell aware services in a follow up.
Make edpm_nodes input multi-cell aware.
Assume a single cell1 yet.
Remove edpm_computes and computes env var
from tests as it is not multi-cell aware, and should be no longer
needed. The docs still use that env var, it will be removed in
multi-cell adoption follow up, where we also cover EDPM multi-cell
adoption.
This is required as rhe rdo-jobs dependency introduces that
change for edpm_nodes and provides a common base for this and future
multi-cell follow ups.
Closes: #184
Depends-On: openstack-k8s-operators/install_yamls#985
Depends-On: https://review.rdoproject.org/r/c/rdo-jobs/+/53192
Jira: #OSPRH-6548