Adding support for adoption scenario 1 #818

averdagu · 2024-05-02T13:32:22Z

Dataplane adoption docs supports doing the adoption while wallaby environment uses different subnets than next generation. This commit enables Makefiles in order to prepare the environment with different subnets between environments.

Related: OSPRH-5881

softwarefactory-project-zuul · 2024-05-02T14:31:39Z

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://review.rdoproject.org/zuul/buildset/c5c21e7abf014fe09fd09f29112f63c2

✔️ openstack-k8s-operators-content-provider SUCCESS in 57m 02s
❌ install-yamls-crc-podified-edpm-baremetal FAILURE in 23m 52s
❌ podified-multinode-edpm-deployment-crc FAILURE in 30m 51s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 37m 22s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 37m 07s

booxter · 2024-05-13T20:50:29Z

Makefile

@@ -35,6 +35,22 @@ CLEANUP_DIR_CMD					 ?= rm -Rf
 # be also cloned from OPENSTACK_REPO/OPENSTACK_BRANCH.
 CHECKOUT_FROM_OPENSTACK_REF	?= false

+ADOPTED_SCENARIO					?=false


names of variables here should not refer to adoption. There's a general case for deploying CP and DP services in different ranges. We should be able to stand up greenfield deployment with different ranges.

This applies both to the code and the commit title / message.

booxter

Could you please give a playbook of commands that one would use to deploy the setup as you intend? Please add them to commit message.

Please also fix pre-commits.

booxter · 2024-05-13T20:51:13Z

Makefile

@@ -35,6 +35,22 @@ CLEANUP_DIR_CMD					 ?= rm -Rf
 # be also cloned from OPENSTACK_REPO/OPENSTACK_BRANCH.
 CHECKOUT_FROM_OPENSTACK_REF	?= false

+ADOPTED_SCENARIO					?=false


This applies both to the code and the commit title / message.

booxter · 2024-05-13T20:52:56Z

devsetup/scripts/standalone.sh

@@ -217,6 +217,16 @@ dns_server: ${PRIMARY_RESOLV_CONF_ENTRY}
 compute_driver: ${COMPUTE_DRIVER}
 sriov_agent: ${EDPM_COMPUTE_SRIOV_ENABLED}
 dhcp_agent: ${EDPM_COMPUTE_DHCP_AGENT_ENABLED}
+# Adoption related stuff
+adoption_scenario: ${ADOPTION_SCENARIO_A}


instead of referring to "adoption" here, please refer to "host_routes" that should be added instead; e.g. storage_host_routes, tenant_host_routes, etc.

booxter · 2024-05-13T20:54:41Z

scripts/gen-netatt.sh

-if [ -z "${DEPLOY_DIR}" ]; then
-    echo "Please set DEPLOY_DIR"; exit 1
-fi
+function check_var_setted () {


setted -> set

booxter · 2024-05-13T20:57:15Z

scripts/gen-nncp.sh

-if [ -z "${DEPLOY_DIR}" ]; then
-    echo "Please set DEPLOY_DIR"; exit 1
-fi
+function check_var_setted () {


booxter · 2024-05-13T20:58:53Z

scripts/gen-nncp.sh

@@ -145,6 +133,25 @@ EOF_CAT
        next-hop-interface: ${BRIDGE_NAME}
 EOF_CAT
        done
+    fi
+    if [ -n "$ADOPTION_CASE_A" ]; then


should be smth like (pseudo-code)

if INTERNALAPI_HOST_ROUTES: echo INTERNALAPI_HOST_ROUTES >> if TENANT_HOST_ROUTES: ...

etc. etc.

booxter · 2024-05-13T21:00:03Z

scripts/gen-nncp.sh

+        next-hop-interface: ${INTERFACE}.${tenant_vlan_id}
+EOF_CAT
+    fi
+    if [ -n "$IPV6_ENABLED" ]; then


hm. why is it needed?

softwarefactory-project-zuul · 2024-05-15T19:23:18Z

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://review.rdoproject.org/zuul/buildset/68f215690f5042079e33575183d8afee

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 38m 10s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 18m 54s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 19m 00s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 50m 36s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 51m 56s

softwarefactory-project-zuul · 2024-05-20T09:50: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://review.rdoproject.org/zuul/buildset/c2a9060024d747bb950c8ee43e94b81b

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 38m 15s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 19m 14s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 17m 17s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 51m 19s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 52m 35s

softwarefactory-project-zuul · 2024-05-28T17:20:39Z

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://review.rdoproject.org/zuul/buildset/e664007fab804645b3184d51e04f4172

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 46m 08s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 17m 25s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 21m 07s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 48m 19s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 57m 19s

softwarefactory-project-zuul · 2024-05-29T10:34:38Z

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://review.rdoproject.org/zuul/buildset/f201b76d01f447bdab030c2eb9a6165a

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 38m 02s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 13m 55s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 24s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 17m 37s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 53m 00s

averdagu · 2024-05-31T16:02:38Z

recheck

softwarefactory-project-zuul · 2024-06-03T14:35:09Z

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://review.rdoproject.org/zuul/buildset/ce81e17c11b545b8a34edaef5d32f2d9

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 10m 17s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 15m 58s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 28m 42s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 51m 39s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph RETRY_LIMIT in 53m 16s

softwarefactory-project-zuul · 2024-06-03T18:29:11Z

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://review.rdoproject.org/zuul/buildset/661344149bd14f6788c276224778c41c

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 21m 53s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 15m 19s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 25m 29s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 1h 55m 11s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph FAILURE in 1h 33m 41s

averdagu · 2024-06-05T12:02:00Z

recheck

softwarefactory-project-zuul · 2024-06-05T16:36:36Z

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://review.rdoproject.org/zuul/buildset/3e8be8aa1a3a4bbab5e6d3af0d2aecac

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 43m 19s
✔️ install-yamls-crc-podified-edpm-baremetal SUCCESS in 1h 18m 46s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 19m 47s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 1h 51m 01s
❌ cifmw-data-plane-adoption-osp-17-to-extracted-crc-minimal-no-ceph FAILURE in 1h 38m 09s

averdagu · 2024-06-06T15:49:52Z

recheck

softwarefactory-project-zuul · 2024-06-06T15:50:09Z

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/install_yamls for 818,e69bd160baf62ec077e05990e413e863417f0435

fao89 · 2024-06-14T15:40:24Z

/approve

openshift-ci · 2024-06-14T15:40:30Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: averdagu, fao89

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~~ [fao89]

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

softwarefactory-project-zuul · 2024-10-04T14:33:52Z

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/64c0f0b2b3be4ef5ae747b53520e1b6c

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 54m 28s
❌ install-yamls-crc-podified-edpm-baremetal RETRY_LIMIT in 26m 12s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 24m 34s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 2h 40m 50s
✔️ adoption-standalone-to-crc-no-ceph-provider SUCCESS in 2h 50m 20s

danpawlik · 2024-10-07T06:56:41Z

recheck

Dataplane adoption docs supports doing the adoption while wallaby environment uses different subnets than next generation. This commit enables Makefiles in order to prepare the environment with different subnets between environments. Related: OSPRH-5881

openshift-ci bot requested review from karelyatin and viroel May 2, 2024 13:32

booxter self-requested a review May 2, 2024 14:09

booxter reviewed May 13, 2024

View reviewed changes

booxter requested changes May 13, 2024

View reviewed changes

openshift-ci bot assigned booxter May 13, 2024

averdagu force-pushed the feat/adoption-scenario-1-support branch 5 times, most recently from 08dcc5e to d870686 Compare May 15, 2024 17:13

averdagu marked this pull request as draft May 15, 2024 17:14

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

averdagu force-pushed the feat/adoption-scenario-1-support branch 2 times, most recently from f0b68ff to 4e9acfb Compare May 15, 2024 17:41

averdagu force-pushed the feat/adoption-scenario-1-support branch from 4e9acfb to d28295b Compare May 20, 2024 08:11

averdagu force-pushed the feat/adoption-scenario-1-support branch 3 times, most recently from acbb1ae to 296dd1c Compare May 28, 2024 14:56

averdagu force-pushed the feat/adoption-scenario-1-support branch from 303c31d to 8f099cc Compare May 29, 2024 07:59

averdagu marked this pull request as ready for review May 31, 2024 16:02

openshift-ci bot removed the do-not-merge/work-in-progress label May 31, 2024

openshift-ci bot requested review from abays and stuggi May 31, 2024 16:02

averdagu force-pushed the feat/adoption-scenario-1-support branch 5 times, most recently from 07f88df to e28ad08 Compare June 3, 2024 11:18

averdagu force-pushed the feat/adoption-scenario-1-support branch from e28ad08 to e69bd16 Compare June 3, 2024 14:50

openshift-merge-robot added the needs-rebase label Jun 6, 2024

averdagu force-pushed the feat/adoption-scenario-1-support branch from e69bd16 to 179ad80 Compare June 6, 2024 15:52

openshift-merge-robot removed the needs-rebase label Jun 6, 2024

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

averdagu force-pushed the feat/adoption-scenario-1-support branch from 179ad80 to 790a225 Compare October 4, 2024 09:47

averdagu force-pushed the feat/adoption-scenario-1-support branch 7 times, most recently from 242e1cf to afc4d32 Compare October 14, 2024 21:53

averdagu force-pushed the feat/adoption-scenario-1-support branch from afc4d32 to a7f1cb4 Compare October 24, 2024 15:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding support for adoption scenario 1 #818

Adding support for adoption scenario 1 #818

averdagu commented May 2, 2024 •

edited by openshift-ci bot

Loading

softwarefactory-project-zuul bot commented May 2, 2024

booxter May 13, 2024

booxter May 13, 2024

booxter left a comment

booxter May 13, 2024

booxter May 13, 2024

booxter May 13, 2024

booxter May 13, 2024

booxter May 13, 2024

booxter May 13, 2024

softwarefactory-project-zuul bot commented May 15, 2024

softwarefactory-project-zuul bot commented May 20, 2024

softwarefactory-project-zuul bot commented May 28, 2024

softwarefactory-project-zuul bot commented May 29, 2024

averdagu commented May 31, 2024

softwarefactory-project-zuul bot commented Jun 3, 2024

softwarefactory-project-zuul bot commented Jun 3, 2024

averdagu commented Jun 5, 2024

softwarefactory-project-zuul bot commented Jun 5, 2024

averdagu commented Jun 6, 2024

softwarefactory-project-zuul bot commented Jun 6, 2024

fao89 commented Jun 14, 2024

openshift-ci bot commented Jun 14, 2024

softwarefactory-project-zuul bot commented Oct 4, 2024

danpawlik commented Oct 7, 2024

Adding support for adoption scenario 1 #818

Are you sure you want to change the base?

Adding support for adoption scenario 1 #818

Conversation

averdagu commented May 2, 2024 • edited by openshift-ci bot Loading

softwarefactory-project-zuul bot commented May 2, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

booxter left a 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

softwarefactory-project-zuul bot commented May 15, 2024

softwarefactory-project-zuul bot commented May 20, 2024

softwarefactory-project-zuul bot commented May 28, 2024

softwarefactory-project-zuul bot commented May 29, 2024

averdagu commented May 31, 2024

softwarefactory-project-zuul bot commented Jun 3, 2024

softwarefactory-project-zuul bot commented Jun 3, 2024

averdagu commented Jun 5, 2024

softwarefactory-project-zuul bot commented Jun 5, 2024

averdagu commented Jun 6, 2024

softwarefactory-project-zuul bot commented Jun 6, 2024

fao89 commented Jun 14, 2024

openshift-ci bot commented Jun 14, 2024

softwarefactory-project-zuul bot commented Oct 4, 2024

danpawlik commented Oct 7, 2024

averdagu commented May 2, 2024 •

edited by openshift-ci bot

Loading