From 08313f1dd0c9d046050724edb0b1af9fc0dbd8ea Mon Sep 17 00:00:00 2001 From: Fabricio Aguiar Date: Fri, 21 Jun 2024 10:38:02 +0100 Subject: [PATCH] Dropping dataplane-operator references Signed-off-by: Fabricio Aguiar --- roles/build_openstack_packages/defaults/main.yml | 1 - roles/edpm_deploy/tasks/main.yml | 15 --------------- roles/edpm_deploy_baremetal/tasks/main.yml | 8 -------- roles/validations/tasks/edpm/hotfix.yml | 2 +- .../tasks/edpm/hugepages_and_reboot.yml | 2 +- roles/validations/tasks/edpm/scaledown.yml | 2 +- .../expected_variables_values.yml | 4 ---- .../files/get_makefiles_env/makefiles/Makefile | 4 ---- zuul.d/base.yaml | 3 --- zuul.d/tempest_multinode.yaml | 1 - 10 files changed, 3 insertions(+), 39 deletions(-) diff --git a/roles/build_openstack_packages/defaults/main.yml b/roles/build_openstack_packages/defaults/main.yml index f6de68ac90..683c79cb63 100644 --- a/roles/build_openstack_packages/defaults/main.yml +++ b/roles/build_openstack_packages/defaults/main.yml @@ -77,7 +77,6 @@ cifmw_bop_skipped_projects: - opendev.org/zuul/zuul-jobs - openstack-k8s-operators/barbican-operator - openstack-k8s-operators/cinder-operator - - openstack-k8s-operators/dataplane-operator - openstack-k8s-operators/designate-operator - openstack-k8s-operators/glance-operator - openstack-k8s-operators/heat-operator diff --git a/roles/edpm_deploy/tasks/main.yml b/roles/edpm_deploy/tasks/main.yml index c7796c78f6..52e478b67a 100644 --- a/roles/edpm_deploy/tasks/main.yml +++ b/roles/edpm_deploy/tasks/main.yml @@ -14,21 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -- name: Define minimal set of repo variables when not running on Zuul - when: - - zuul is not defined - - cifmw_operator_build_output is defined - - "'dataplane-operator' in operators_build_output.operators" - tags: - - always - vars: - operators_build_output: "{{ (cifmw_operator_build_output | default({'operators':{}})).operators }}" - ansible.builtin.set_fact: - _install_yamls_repos: - DATAPLANE_BRANCH: "" - GIT_CLONE_OPTS': "-l" - DATAPLANE_REPO': "{{ operators_build_output['dataplane-operator'].git_src_dir }}" - - name: Set EDPM related vars when: - cifmw_install_yamls_environment is defined diff --git a/roles/edpm_deploy_baremetal/tasks/main.yml b/roles/edpm_deploy_baremetal/tasks/main.yml index aeed057db7..a40d4e30e9 100644 --- a/roles/edpm_deploy_baremetal/tasks/main.yml +++ b/roles/edpm_deploy_baremetal/tasks/main.yml @@ -29,14 +29,6 @@ 'GIT_CLONE_OPTS': '-l', } if (cifmw_operator_build_meta_name is defined and cifmw_operator_build_meta_name in operators_build_output) else {} - ) | - combine( - { - 'DATAPLANE_REPO': operators_build_output['dataplane-operator'].git_src_dir, - 'DATAPLANE_BRANCH': '', - 'GIT_CLONE_OPTS': '-l', - } if ('dataplane-operator' in operators_build_output) - else {} ) }} diff --git a/roles/validations/tasks/edpm/hotfix.yml b/roles/validations/tasks/edpm/hotfix.yml index b6202ab448..750827c68e 100644 --- a/roles/validations/tasks/edpm/hotfix.yml +++ b/roles/validations/tasks/edpm/hotfix.yml @@ -1,4 +1,4 @@ -# This job tests the functionality of the dataplane-operator to take an arbitrary hotfixed +# This job tests the functionality of the openstack-operator to take an arbitrary hotfixed # image as input, then role out the hotfix to the deployed nodes. # # This job was created to satisfy: diff --git a/roles/validations/tasks/edpm/hugepages_and_reboot.yml b/roles/validations/tasks/edpm/hugepages_and_reboot.yml index 4801655a80..9a2de54343 100644 --- a/roles/validations/tasks/edpm/hugepages_and_reboot.yml +++ b/roles/validations/tasks/edpm/hugepages_and_reboot.yml @@ -1,4 +1,4 @@ -# This job tests the functionality of the dataplane-operator to update values for a given +# This job tests the functionality of the openstack-operator to update values for a given # openstackdataplanenodeset and have them applied to nodes within the cluster. Specifically, # we will update the value for hugepages, ensure it is applied to the node, and that the node # has been rebooted. diff --git a/roles/validations/tasks/edpm/scaledown.yml b/roles/validations/tasks/edpm/scaledown.yml index 9a5d0f21ef..35b08a448a 100644 --- a/roles/validations/tasks/edpm/scaledown.yml +++ b/roles/validations/tasks/edpm/scaledown.yml @@ -1,4 +1,4 @@ -# This job tests the functionality of the dataplane-operator to remove a +# This job tests the functionality of the openstack-operator to remove a # compute node. # # This job was created to satisfy: diff --git a/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml b/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml index dfd71d50e4..944b06b352 100644 --- a/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml +++ b/tests/integration/targets/make/files/get_makefiles_env/expected_variables_values.yml @@ -61,8 +61,6 @@ variables: DATAPLANE_DEFAULT_GW: "192.168.122.1" DATAPLANE_DEPLOY_STRATEGY_DEPLOY: "false" DATAPLANE_NETWORK_INTERFACE_NAME: "eth0" - DATAPLANE_NODESET_BAREMETAL_CR: "/home/test-user/out/operator/dataplane-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml" - DATAPLANE_NODESET_CR: "/home/test-user/out/operator/dataplane-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml" DATAPLANE_NTP_SERVER: "pool.ntp.org" DATAPLANE_OVN_METADATA_AGENT_BIND_HOST: "127.0.0.1" DATAPLANE_REGISTRY_URL: "quay.io/podified-antelope-centos9" @@ -208,8 +206,6 @@ variables: OPENSTACK_CR: "/home/test-user/out/operator/openstack-operator/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml" OPENSTACK_CRDS_DIR: "openstack_crds" OPENSTACK_CTLPLANE: "config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml" - OPENSTACK_DATAPLANENODESET: "config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml" - OPENSTACK_DATAPLANENODESET_BAREMETAL: "config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml" OPENSTACK_IMG: "quay.io/openstack-k8s-operators/openstack-operator-index:latest" OPENSTACK_KUTTL_CONF: "/home/test-user/out/operator/openstack-operator/kuttl-test.yaml" OPENSTACK_KUTTL_DIR: "/home/test-user/out/operator/openstack-operator/tests/kuttl/tests" diff --git a/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile b/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile index ef32c26217..6f7dc53062 100644 --- a/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile +++ b/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile @@ -281,10 +281,6 @@ BAREMETAL_BRANCH ?= main BMH_NAMESPACE ?= ${NAMESPACE} # Dataplane Operator -OPENSTACK_DATAPLANENODESET ?= config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml -OPENSTACK_DATAPLANENODESET_BAREMETAL ?= config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml -DATAPLANE_NODESET_CR ?= ${OPERATOR_BASE_DIR}/dataplane-operator/${OPENSTACK_DATAPLANENODESET} -DATAPLANE_NODESET_BAREMETAL_CR ?= ${OPERATOR_BASE_DIR}/dataplane-operator/${OPENSTACK_DATAPLANENODESET_BAREMETAL} DATAPLANE_ANSIBLE_SECRET ?=dataplane-ansible-ssh-private-key-secret DATAPLANE_ANSIBLE_USER ?= DATAPLANE_COMPUTE_IP ?=192.168.122.100 diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index 5827ddb3d8..0a34670ca6 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -79,7 +79,6 @@ - openstack-k8s-operators/barbican-operator - openstack-k8s-operators/ci-framework - openstack-k8s-operators/cinder-operator - - openstack-k8s-operators/dataplane-operator - openstack-k8s-operators/designate-operator - openstack-k8s-operators/glance-operator - openstack-k8s-operators/heat-operator @@ -130,7 +129,6 @@ irrelevant-files: *ir_files required-projects: &multinode_edpm_rp - openstack-k8s-operators/ci-framework - - openstack-k8s-operators/dataplane-operator - openstack-k8s-operators/install_yamls - openstack-k8s-operators/infra-operator - openstack-k8s-operators/openstack-baremetal-operator @@ -271,7 +269,6 @@ irrelevant-files: *ir_files required-projects: - openstack-k8s-operators/ci-framework - - openstack-k8s-operators/dataplane-operator - openstack-k8s-operators/install_yamls - openstack-k8s-operators/infra-operator - openstack-k8s-operators/openstack-baremetal-operator diff --git a/zuul.d/tempest_multinode.yaml b/zuul.d/tempest_multinode.yaml index 9aff91fac1..a23237657c 100644 --- a/zuul.d/tempest_multinode.yaml +++ b/zuul.d/tempest_multinode.yaml @@ -58,7 +58,6 @@ required-projects: - github.com/openstack-k8s-operators/install_yamls - openstack-k8s-operators/ci-framework - - openstack-k8s-operators/dataplane-operator - openstack-k8s-operators/infra-operator - openstack-k8s-operators/openstack-baremetal-operator - openstack-k8s-operators/openstack-operator