Add role to deploy 17.1 env for adoption #2297

cescgina · 2024-09-03T13:31:23Z

Add a new role that will deploy a tripleo environment that will serve as
source for adoption. This role is expected to cosume the infra created
by [1], and a 17.1 scenario definition from the data-plane-adoption
repo, introduced by [2].

It also introduce a small fix to the deploy-ocp.yml so the resulting ocp
cluster is ready (the nodes needed to be uncordoned).

[1] #2285
[2] openstack-k8s-operators/data-plane-adoption#597

github-actions · 2024-09-03T13:31:35Z

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

cjeanner

Would need some more flexibility, but it could match the need with some tweaks/iterations.

roles/adoption_osp_deploy/files/undercloud.conf

roles/adoption_osp_deploy/tasks/deploy_ceph.yml

roles/adoption_osp_deploy/tasks/overcloud_deploy.yml

roles/adoption_osp_deploy/tasks/main.yml

softwarefactory-project-zuul · 2024-09-03T23:48:50Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/3e0801ce95b34d3184964958b146d59f

✔️ openstack-k8s-operators-content-provider SUCCESS in 10h 11m 04s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 43s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 25m 40s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 23s
❌ cifmw-pod-pre-commit FAILURE in 5m 39s
✔️ build-push-container-cifmw-client SUCCESS in 37m 19s

softwarefactory-project-zuul · 2024-09-04T13:13:24Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/f96d929a98b34e69a20a3813f6e9f506

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 14m 09s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 12m 43s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 28m 44s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 44s
❌ cifmw-pod-pre-commit FAILURE in 5m 37s
✔️ build-push-container-cifmw-client SUCCESS in 37m 04s

softwarefactory-project-zuul · 2024-09-05T19:11:30Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/179a53575c8e437a909be2c41711f18c

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 33m 15s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 26s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 23m 39s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 39s
❌ cifmw-pod-pre-commit FAILURE in 5m 40s
✔️ build-push-container-cifmw-client SUCCESS in 37m 40s

softwarefactory-project-zuul · 2024-09-06T13:46:46Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/100b262aeb704c85b86c6589151688bf

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 46m 28s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 18m 33s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 26m 06s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 44s
❌ cifmw-pod-pre-commit FAILURE in 5m 25s
✔️ build-push-container-cifmw-client SUCCESS in 37m 00s

softwarefactory-project-zuul · 2024-09-10T08:07:42Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/11d5100f2b374d3d875c5cd958cdfef7

✔️ openstack-k8s-operators-content-provider SUCCESS in 34m 34s
❌ podified-multinode-edpm-deployment-crc FAILURE in 17m 05s
❌ cifmw-crc-podified-edpm-baremetal FAILURE in 21m 52s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 33s
❌ cifmw-pod-pre-commit FAILURE in 6m 20s
✔️ build-push-container-cifmw-client SUCCESS in 22m 29s

softwarefactory-project-zuul · 2024-09-10T19:38:31Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c8f71eecadfe40639c4e22942a5fb6c5

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 43m 57s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 39s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 31m 01s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 50s
❌ cifmw-pod-pre-commit FAILURE in 5m 37s
✔️ build-push-container-cifmw-client SUCCESS in 20m 46s

softwarefactory-project-zuul · 2024-09-13T16:02:12Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/c22a1ed7df85440d83b1bb6fc81d2aa0

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 40m 24s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 26s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 25m 59s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 17s
❌ cifmw-pod-pre-commit FAILURE in 7m 40s
✔️ build-push-container-cifmw-client SUCCESS in 30m 23s

deploy-osp-adoption.yml

roles/adoption_osp_deploy/tasks/prepare_undercloud.yml

roles/adoption_osp_deploy/tasks/prepare_overcloud.yml

softwarefactory-project-zuul · 2024-09-20T16:09:25Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/2c06710e48894922925227767bc3a40b

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 02m 30s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 43s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 19m 04s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 37s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 27s
❌ build-push-container-cifmw-client TIMED_OUT in 1h 30m 37s

softwarefactory-project-zuul · 2024-09-25T17:26:34Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/782d8ffaf82c413cab42bc91c2a5128d

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 50m 00s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 23s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 29m 49s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 39s
❌ cifmw-pod-pre-commit FAILURE in 7m 11s
✔️ build-push-container-cifmw-client SUCCESS in 31m 20s

deploy-osp-adoption.yml

cescgina · 2024-10-09T16:48:15Z

@lewisdenny thanks for the extensive review, I've updated the PR with some changes, please take a look when you have some time

pablintino

I did my best to review this one (not finished yet), but with this size is almost impossible to do a proper review.
Most of my comments are cosmetic ones, but I'm writing down them mainly because I'm sure that no one will have time to fix them when this PR is merged.

pablintino · 2024-10-11T11:43:14Z

deploy-osp-adoption.yml

+            loop_var: "_inventory_file"
+
+    - name: Gather ansible_user_id from controller for hooks
+      ansible.builtin.setup:


This task name Gather ansible_user_id from controller for hooks is misleading. The ansible.builtin.setup will target the playbook target, as it's not delegated, meaning it will collect the facts you ask to collect from localhost only. If you want to collect the facts from the controller you need to delegate the task to that host.

fixed the task name, it was doing the right thing, but the description was wrong

I am late to the party, albeit my question is likely related to the ci framework design, not this implementation that follows it. Why do we need to make ansible parsing other ansible/t-h-t objects from yaml files, instead of using direct inputs?

pablintino · 2024-10-11T11:47:16Z

deploy-osp-adoption.yml

+          cifmw_adoption_osp_deploy_scenario:
+            {{ cifmw_adoption_osp_deploy_scenario | to_nice_yaml(indent=2) | indent(width=2) }}
+          _vm_groups:
+            {{ _vm_groups | to_nice_yaml(indent=2) | indent(width=2) }}


You won't need to deal with indentation if the file is written the proper way:

- name: Save variables for use with hooks vars: __content: cifmw_adoption_osp_deploy_ntp_server: "{{ cifmw_adoption_osp_deploy_ntp_server }}" cifmw_adoption_source_scenario_path: "{{ cifmw_adoption_source_scenario_path }}" cifmw_adoption_osp_deploy_scenario: "{{ cifmw_adoption_osp_deploy_scenario }}" _vm_groups: "{{ _vm_groups }}" ansible.builtin.copy: dest: "{{ cifmw_basedir }}/artifacts/parameters/adoption_osp.yml" content: "{{ __content | to_nice_yaml }}"

thanks, that is a great improvement!

pablintino · 2024-10-11T11:53:27Z

roles/adoption_osp_deploy/tasks/prepare_overcloud.yml

+         _stack.network_data_file
+        ] | path_join
+      }}
+    _network_data_file_dest: "{{ ansible_user_dir }}/network_data_{{ _overcloud_name }}.yaml"


In the previous line we use path_join. I'd prefer to be consistent, especially in code that belongs to the same PR.

done, thanks

pablintino · 2024-10-11T12:00:11Z

deploy-osp-adoption.yml

+            _path_inventories: "{{ ansible_user_dir }}/ci-framework-data/reproducer-inventory"
+          ansible.builtin.slurp:
+            path: "{{ _path_inventories }}/{{ _group_name }}-group.yml"
+          register: _files


Meaningless variable name

thanks, I made the name more explicit

pablintino · 2024-10-11T12:02:23Z

deploy-osp-adoption.yml

+          vars:
+            _content: "{{ _inventory_file.content | b64decode | from_yaml }}"
+            _group_name: "{{ _inventory_file.source | basename | regex_replace('-group.yml', '') }}"
+            _nodes: "{{ _content[_group_name~'s']['hosts'].keys() }}"


Assuming the groups will be always named _group_name + 's' looks fragile. One small change in the reproducer inventory dump and we will miss that adoption is making this assumption.

indeed, that is error-prone and turns out the assumption is not needed, I've changed the code to simply read the group name from the file

pablintino · 2024-10-11T12:14:26Z

hooks/playbooks/adoption_deploy_ceph.yml

+      block:
+        - name: Copy ceph osd file
+          delegate_to: "osp-undercloud-0"
+          ansible.builtin.copy:


File manipulations without explicitly setting the mode will cause linter issues. iirc it's one of the rules we disabled, so no problem for now, but at some point someone will need to touch this freshly added code to make it complaint.

good catch, I haven't thought about this, I think I added the mode to all the tasks now

pablintino · 2024-10-11T12:17:42Z

roles/adoption_osp_deploy/tasks/config_files.yml

+    _config_download: >
+      {{
+        _original_config_download['content'] |
+        b64decode | from_yaml
+      }}
+    _new_config_download_fields: {}
+    _ctlplane_net: "{{ cifmw_networking_env_definition.networks.ctlplane }}"


All the *download* vars are not used till the very end of the block in one single task. Care to move them to there? I was searching where are they used all over the file...

yep, moved them all to the end

pablintino · 2024-10-11T12:19:48Z

roles/adoption_osp_deploy/tasks/config_files.yml

+    - name: Gather overcloud tripleo nodes
+      when: group.key is in _hostname_map_translation
+      ansible.builtin.set_fact:
+        _tripleo_nodes: >-
+          {{
+             _tripleo_nodes | default([]) +
+             group.value
+          }}
+      loop: "{{ _vm_groups | dict2items }}"
+      loop_control:
+        loop_var: group
+        label: "{{ group.key }}"
+
+    - name: Generate Hostnamemap field
+      when: group.key is in _hostname_map_translation
+      vars:
+        _tripleo_name: "{{ _hostname_map_translation[group.key] }}"
+        _group_nodes: >-
+          {%- set hosts = {} -%}
+          {%- for node in group.value -%}
+            {%- set key = _tripleo_name ~ '-' ~ loop.index0 | string  -%}
+            {%- set _ = hosts.update({key: node}) -%}
+          {%- endfor -%}
+          {{ hosts }}
+      ansible.builtin.set_fact:
+        _hostname_map: >-
+          {{
+            _hostname_map | default({}) |
+            combine(_group_nodes)
+          }}
+      loop: "{{ _vm_groups | dict2items }}"
+      loop_control:
+        loop_var: group
+        label: "{{ group.key }}"


Both loops can be perfectly joined and the second one doesn't depend in the computation done in the first one.

indeed, thanks, I've merged them

pablintino · 2024-10-11T12:44:33Z

roles/adoption_osp_deploy/tasks/prepare_undercloud.yml

+  args:
+    apply:
+      delegate_to: "osp-undercloud-0"
+


Almost all the following tasks are delegated. Why not use a block to improve readability?

done, thanks!

jistr · 2024-10-11T13:48:56Z

There are already detailed reviews so i just did a higher level "let me grasp what's going on" review.

I just wondered whether we'll want to support deployment without subscription-manager (with rhos-release), but that's yet another potential enhancement that should probably not be included in this PR anymore :)

Thank you very much for the work on this. LGTM 👍

lewisdenny · 2024-10-13T22:51:40Z

I will take another pass after @pablintino review is addressed

Add the following improvements from reviews: - Allow network_data.yaml to be a template - Build inventory for ceph migration in tripleo-ansible-inventory - Generate adoption_vars to use with the adoption_tests - Allow users to pass an overcloud_deploy command - Support deploying multiple stacks - Support not passing cifmw_target_host - Add validation to scenario input - Add role var for the 17.1 scenario

cescgina · 2024-10-14T10:00:54Z

@pablintino thanks for the review, I think I've addressed all your comments @lewisdenny I've updated the PR with the changes after testing locally, ptal when you have some time

pablintino · 2024-10-14T12:29:01Z

/approve

openshift-ci · 2024-10-14T12:29:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [pablintino]

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

frenzyfriday · 2024-10-14T12:36:05Z

/lgtm

github-actions bot marked this pull request as draft September 3, 2024 13:31

openshift-ci bot added the do-not-merge/work-in-progress label Sep 3, 2024

cjeanner reviewed Sep 3, 2024

View reviewed changes

cescgina force-pushed the adoption_osp_role branch from 6908cc9 to d5f18ed Compare September 4, 2024 10:45

cescgina force-pushed the adoption_osp_role branch 2 times, most recently from ae14a9b to cd97aff Compare September 5, 2024 15:57

cescgina force-pushed the adoption_osp_role branch from cd97aff to be4fffd Compare September 6, 2024 11:36

cescgina force-pushed the adoption_osp_role branch from be4fffd to 87dd378 Compare September 10, 2024 07:32

cescgina force-pushed the adoption_osp_role branch from 87dd378 to 7413ab1 Compare September 10, 2024 17:53

cescgina requested a review from marios September 13, 2024 09:33

cescgina force-pushed the adoption_osp_role branch from 7413ab1 to ee6fda9 Compare September 13, 2024 13:57

cescgina force-pushed the adoption_osp_role branch from ee6fda9 to bfc7d98 Compare September 17, 2024 19:14

ciecierski reviewed Sep 19, 2024

View reviewed changes

deploy-osp-adoption.yml Outdated Show resolved Hide resolved

ciecierski reviewed Sep 19, 2024

View reviewed changes

deploy-osp-adoption.yml Outdated Show resolved Hide resolved

ciecierski reviewed Sep 19, 2024

View reviewed changes

roles/adoption_osp_deploy/tasks/prepare_undercloud.yml Outdated Show resolved Hide resolved

ciecierski reviewed Sep 19, 2024

View reviewed changes

roles/adoption_osp_deploy/tasks/prepare_overcloud.yml Show resolved Hide resolved

cescgina force-pushed the adoption_osp_role branch from bfc7d98 to ae7d460 Compare September 20, 2024 13:53

cescgina force-pushed the adoption_osp_role branch from ae7d460 to 1b62440 Compare September 25, 2024 13:08

cescgina force-pushed the adoption_osp_role branch 2 times, most recently from e99f3b5 to 74423c1 Compare September 26, 2024 15:58

lewisdenny requested a review from pablintino October 9, 2024 06:13

ciecierski reviewed Oct 9, 2024

View reviewed changes

deploy-osp-adoption.yml Show resolved Hide resolved

cescgina force-pushed the adoption_osp_role branch from 8bfd74d to d8d0f19 Compare October 9, 2024 16:47

github-actions bot removed the Ready For Review label Oct 9, 2024

github-actions bot added the Ready For Review label Oct 9, 2024

cescgina force-pushed the adoption_osp_role branch from d8d0f19 to e94bf89 Compare October 10, 2024 15:12

github-actions bot added Ready For Review and removed Ready For Review labels Oct 10, 2024

ciecierski approved these changes Oct 11, 2024

View reviewed changes

pablintino reviewed Oct 11, 2024

View reviewed changes

lewisdenny self-requested a review October 13, 2024 22:51

cescgina force-pushed the adoption_osp_role branch from e94bf89 to 8ea4cc9 Compare October 14, 2024 10:00

github-actions bot removed the Ready For Review label Oct 14, 2024

openshift-ci bot added the approved label Oct 14, 2024

marios approved these changes Oct 14, 2024

View reviewed changes

openshift-ci bot assigned frenzyfriday Oct 14, 2024

openshift-ci bot added the lgtm label Oct 14, 2024

github-actions bot added Ready For Review and removed Ready For Review labels Oct 14, 2024

openshift-merge-bot bot merged commit 9d26487 into main Oct 14, 2024
5 checks passed

openshift-merge-bot bot deleted the adoption_osp_role branch October 14, 2024 14:03

Add role to deploy 17.1 env for adoption #2297

Add role to deploy 17.1 env for adoption #2297

Conversation

cescgina commented Sep 3, 2024 • edited Loading

github-actions bot commented Sep 3, 2024

cjeanner left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Sep 3, 2024

softwarefactory-project-zuul bot commented Sep 4, 2024

softwarefactory-project-zuul bot commented Sep 5, 2024

softwarefactory-project-zuul bot commented Sep 6, 2024

softwarefactory-project-zuul bot commented Sep 10, 2024

softwarefactory-project-zuul bot commented Sep 10, 2024

softwarefactory-project-zuul bot commented Sep 13, 2024

softwarefactory-project-zuul bot commented Sep 20, 2024

softwarefactory-project-zuul bot commented Sep 25, 2024

cescgina commented Oct 9, 2024

pablintino left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bogdando Oct 15, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jistr commented Oct 11, 2024

lewisdenny commented Oct 13, 2024

cescgina commented Oct 14, 2024

pablintino commented Oct 14, 2024

openshift-ci bot commented Oct 14, 2024

frenzyfriday commented Oct 14, 2024

cescgina commented Sep 3, 2024 •

edited

Loading

bogdando Oct 15, 2024 •

edited

Loading