Drop unused dataplane vars

ref: - openstack-k8s-operators/install_yamls#810 - openstack-k8s-operators/openstack-operator#765 Signed-off-by: Fabricio Aguiar <[email protected]>
openstack-k8s-operators · Jun 18, 2024 · 73170de · 73170de
1 parent 2ef6e09
commit 73170de
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/roles/edpm_deploy/README.md b/roles/edpm_deploy/README.md
@@ -7,7 +7,6 @@ None
 ## Parameters
 * `cifmw_edpm_deploy_basedir`: (String) Base directory. Defaults to `cifmw_basedir` which defaults to `~/ci-framework-data`.
 * `cifmw_edpm_deploy_manifests_dir`: (String) Directory in where install_yamls output manifests will be placed. Defaults to `"{{ cifmw_manifests | default(cifmw_edpm_deploy_basedir ~ '/artifacts/manifests') }}"`.
-* `cifmw_edpm_edploy_dataplane_operator_repo`: (String) Path to Dataplane-operator repo. Defaults to `"{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/dataplane-operator"`.
 * `cifmw_edpm_deploy_os_runner_img`: (String) OpenStack Runner image url. Defaults to `"quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"`.
 * `cifmw_edpm_deploy_dataplanenodeset_cr`: (String) Path to OpenStackDataPlaneNodeSet CR. Defaults to `"config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml"`.
 * `cifmw_edpm_deploy_retries`: (Integer) Number of retries for edpm deploy status. Defaults to `100`.

diff --git a/roles/edpm_kustomize/molecule/default/prepare.yml b/roles/edpm_kustomize/molecule/default/prepare.yml
@@ -37,12 +37,12 @@
 
         - name: Clone dummy operator  # noqa: latest[git]
           ansible.builtin.git:
-            repo: "https://github.com/openstack-k8s-operators/dataplane-operator"
-            dest: "{{ cifmw_basedir }}/src/dataplane-operator"
+            repo: "https://github.com/openstack-k8s-operators/openstack-operator"
+            dest: "{{ cifmw_basedir }}/src/openstack-operator"
             accept_hostkey: true
 
         - name: Copy dataplane sample
           ansible.builtin.copy:
             remote_src: true
-            src: "{{ cifmw_basedir }}/src/dataplane-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml"
+            src: "{{ cifmw_basedir }}/src/openstack-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml"
             dest: "{{ cifmw_basedir }}/artifacts/manifests/openstack/dataplane/cr/dataplane_v1beta1_openstackdataplanenodeset.yaml"
diff --git a/roles/install_yamls/molecule/default/converge.yml b/roles/install_yamls/molecule/default/converge.yml
@@ -29,9 +29,9 @@
             name: openstack-k8s-operators/ci-framework
             src_dir: src/github.com/openstack-k8s-operators/ci-framework
         - project:
-            short_name: dataplane-operator
-            name: openstack-k8s-operators/dataplane-operator
-            src_dir: src/github.com/openstack-k8s-operators/dataplane-operator
+            short_name: openstack-operator
+            name: openstack-k8s-operators/openstack-operator
+            src_dir: src/github.com/openstack-k8s-operators/openstack-operator
         - project:
             short_name: openstack-baremetal-operator
             name: openstack-k8s-operators/openstack-baremetal-operator
@@ -69,8 +69,8 @@
     - name: Validate zuul_set_operators_repo output
       vars:
         expected_output:
-          DATAPLANE_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/dataplane-operator"
-          DATAPLANE_BRANCH: ""
+          OPENSTACK_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-operator"
+          OPENSTACK_BRANCH: ""
           BAREMETAL_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/openstack-baremetal-operator"
           BAREMETAL_BRANCH: ""
       ansible.builtin.assert:

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
@@ -55,23 +55,17 @@ variables:
   CRC_URL: "'https://developers.redhat.com/content-gateway/file/pub/openshift-v4/clients/crc/2.19.0/crc-linux-amd64.tar.xz'"
   DATAPLANE_ANSIBLE_SECRET: "dataplane-ansible-ssh-private-key-secret"
   DATAPLANE_ANSIBLE_USER: ""
-  DATAPLANE_NODESET_BAREMETAL_CR: "/home/test-user/out/operator/dataplane-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset_baremetal_with_ipam.yaml"
-  DATAPLANE_BRANCH: "main"
-  DATAPLANE_NTP_SERVER: "pool.ntp.org"
   DATAPLANE_COMPUTE_1_IP: "192.168.122.101"
   DATAPLANE_COMPUTE_IP: "192.168.122.100"
   DATAPLANE_CONTAINER_TAG: "current-podified"
-  DATAPLANE_NODESET_CR: "/home/test-user/out/operator/dataplane-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml"
   DATAPLANE_DEFAULT_GW: "192.168.122.1"
   DATAPLANE_DEPLOY_STRATEGY_DEPLOY: "false"
-  DATAPLANE_IMG: "quay.io/openstack-k8s-operators/dataplane-operator-index:latest"
-  DATAPLANE_KUTTL_CONF: "/home/test-user/out/operator/dataplane-operator/kuttl-test.yaml"
-  DATAPLANE_KUTTL_DIR: "/home/test-user/out/operator/dataplane-operator/tests/kuttl/tests"
-  DATAPLANE_KUTTL_NAMESPACE: "dataplane-kuttl-tests"
   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"
-  DATAPLANE_REPO: "https://github.com/openstack-k8s-operators/dataplane-operator.git"
   DATAPLANE_RUNNER_IMG: "quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"
   DATAPLANE_SINGLE_NODE: "true"
   DATAPLANE_SSHD_ALLOWED_RANGES: "['192.168.122.0/24']"

diff --git a/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile b/tests/integration/targets/make/files/get_makefiles_env/makefiles/Makefile
@@ -281,9 +281,6 @@ BAREMETAL_BRANCH    ?= main
 BMH_NAMESPACE       ?= ${NAMESPACE}
 
 # Dataplane Operator
-DATAPLANE_IMG                                    ?= quay.io/openstack-k8s-operators/dataplane-operator-index:latest
-DATAPLANE_REPO                                   ?= https://github.com/openstack-k8s-operators/dataplane-operator.git
-DATAPLANE_BRANCH                                 ?= main
 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}
@@ -301,9 +298,6 @@ DATAPLANE_REGISTRY_URL                           ?=quay.io/podified-antelope-cen
 DATAPLANE_CONTAINER_TAG                          ?=current-podified
 DATAPLANE_OVN_METADATA_AGENT_BIND_HOST           ?=127.0.0.1
 DATAPLANE_SINGLE_NODE                            ?=true
-DATAPLANE_KUTTL_CONF      ?= ${OPERATOR_BASE_DIR}/dataplane-operator/kuttl-test.yaml
-DATAPLANE_KUTTL_DIR       ?= ${OPERATOR_BASE_DIR}/dataplane-operator/tests/kuttl/tests
-DATAPLANE_KUTTL_NAMESPACE ?= dataplane-kuttl-tests
 DATAPLANE_DEFAULT_GW      ?= 192.168.122.1
 
 # Manila