Merge pull request #1103 from abays/upstream_dns

Allow customization of upstream DNS for IPv4

Author: openshift-merge-bot[bot]

Makefile

@@ -817,6 +817,7 @@ openstack_deploy_prep: export BRIDGE_NAME=${NNCP_BRIDGE}
 openstack_deploy_prep: export CTLPLANE_IP_ADDRESS_PREFIX=${NNCP_CTLPLANE_IPV6_ADDRESS_PREFIX}
 ifeq ($(NETWORK_ISOLATION_IPV4), true)
 openstack_deploy_prep: export IPV4_ENABLED=true
+openstack_deploy_prep: export CTLPLANE_IPV4_DNS_SERVER=${NNCP_DNS_SERVER}
 endif
 ifeq ($(NETWORK_ISOLATION_IPV6), true)
 openstack_deploy_prep: export IPV6_ENABLED=true

scripts/gen-service-kustomize.sh

@@ -504,6 +504,23 @@ if [[ "${KIND}" == "OpenStackControlPlane" ]]; then
   patch: |-
     - op: remove
       path: /spec/dns/template/options/0/values/0
+EOF
+    else
+        cat <<EOF >>kustomization.yaml
+- patch: |-
+    apiVersion: core.openstack.org/v1beta1
+    kind: ${KIND}
+    metadata:
+      name: unused
+    spec:
+      dns:
+        template:
+          options:
+          - key: server
+            values:
+            - ${CTLPLANE_IPV4_DNS_SERVER}
+  target:
+    kind: ${KIND}
 EOF
     fi