Merge pull request #1050 from renjingxiao/OSPRH-17761

Configuring nicMappings for OVN gateways

Author: openshift-merge-bot[bot]

Makefile

@@ -59,6 +59,11 @@ test-swift-migration:
 	mkdir -p tests/logs
 	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_SECRETS) -e @$(TEST_VARS)  $(TEST_ARGS) tests/playbooks/test_swift_migration.yaml 2>&1 | tee $(TEST_OUTFILE)
 
+test-ocp-as-gw: TEST_OUTFILE ?= tests/logs/test_ocp_as_gw_out_$(shell date +%FT%T%Z).log
+test-ocp-as-gw:  ## Launch test suite related to the ocp gateways
+	mkdir -p tests/logs
+	ANSIBLE_CONFIG=$(TEST_CONFIG) ansible-playbook -v -i $(TEST_INVENTORY) -e @$(TEST_SECRETS) -e @$(TEST_VARS)  $(TEST_ARGS) tests/playbooks/test_ocp_as_gw.yaml 2>&1 | tee $(TEST_OUTFILE)
+
 test-rollback-minimal: TEST_OUTFILE ?= tests/logs/test_rollback_minimal_out_$(shell date +%FT%T%Z).log
 test-rollback-minimal:
 	mkdir -p tests/logs

tests/playbooks/test_ocp_as_gw.yaml

@@ -0,0 +1,11 @@
+- name: Configuring nicMappings for OCP gateways
+  hosts: local
+  gather_facts: false
+  force_handlers: true
+  module_defaults:
+    ansible.builtin.shell:
+      executable: /bin/bash
+  roles:
+    - role: ocp_as_gw
+      tags:
+        - ocp_as_gw

tests/roles/ocp_as_gw/defaults/main.yaml

@@ -0,0 +1,10 @@
+ironic_adoption: false
+
+ovn_nic_mapping_patch: |
+  spec:
+    ovn:
+      enabled: true
+      template:
+        ovnController:
+          nicMappings:
+            datacentre: ocpbr

tests/roles/ocp_as_gw/meta/main.yaml

@@ -0,0 +1,2 @@
+dependencies:
+  - role: common_defaults

tests/roles/ocp_as_gw/tasks/main.yaml

@@ -0,0 +1,6 @@
+- name: Add OVN nicMappings for OpenShift as gateway
+  when: not ironic_adoption|bool
+  ansible.builtin.shell: |
+    {{ shell_header }}
+    {{ oc_header }}
+    oc patch openstackcontrolplane openstack --type=merge --patch '{{ ovn_nic_mapping_patch }}'