Merge pull request #828 from rabi/search_var

Fix search domains var in nic config samples
openstack-k8s-operators · Apr 16, 2024 · 0fe56da · 0fe56da
2 parents 59b04a4 + 9aaff68
commit 0fe56da
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1

diff --git a/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2 b/config/samples/nic-config-samples/bonds_vlans/bonds_vlans_storage.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: br-bond
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1

diff --git a/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/bonds_vlans/controller_no_external.j2
@@ -15,7 +15,7 @@ network_config:
 - type: ovs_bridge
   name: {{ neutron_physical_bridge_name }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   members:
   - type: ovs_bond
     name: bond1

diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dpdk.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2 b/config/samples/nic-config-samples/multiple_nics/multiple_nics_dvr.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dpdk.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2 b/config/samples/nic-config-samples/multiple_nics_vlans/multiple_nics_vlans_dvr.j2
@@ -4,7 +4,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2 b/config/samples/nic-config-samples/single_nic_vlans/controller_no_external.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}

diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}

diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_bgp.j2
@@ -9,7 +9,7 @@ network_config:
   name: nic1
   mtu: {{ ctlplane_mtu }}
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   routes: {{ ctlplane_host_routes }}
   use_dhcp: false
   addresses:

diff --git a/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2 b/config/samples/nic-config-samples/single_nic_vlans/single_nic_vlans_storage.j2
@@ -10,7 +10,7 @@ network_config:
   mtu: {{ min_viable_mtu }}
   use_dhcp: false
   dns_servers: {{ ctlplane_dns_nameservers }}
-  domain: {{ edpm_dns_search_domains }}
+  domain: {{ dns_search_domains }}
   addresses:
   - ip_netmask: {{ ctlplane_ip }}/{{ ctlplane_cidr }}
   routes: {{ ctlplane_host_routes }}