support dns

agent-config.yaml

@@ -1,7 +1,11 @@
 {% import 'static_network/config.j2' as static_network %}
 {% set baremetal_prefix = baremetal_cidr.split('/')[1] %}
 {% set baremetal_gateway = static_baremetal_gateway or baremetal_cidr|network_ip(1 if lab else -2) %}
+{% if dns %}
+{% set baremetal_dns = installer_ip %}
+{% else %}
 {% set baremetal_dns = static_baremetal_dns or baremetal_gateway %}
+{% endif %}
 {% set nic = 'ens192' if config_type == 'vsphere' else 'enp1s0' %}
 {% set virtual_ctlplanes_nodes = [] %}
 {% set virtual_workers_nodes = [] %}

kcli_pre.sh

@@ -12,6 +12,11 @@ exit 1
 {% set baremetal_prefix = baremetal_cidr.split('/')[1] %}
 {% endif %}
 
+{% if dns and installer_ip == None %}
+echo Deploying dns requires to set installer_ip
+exit 1
+{% endif %}
+
 {% set virtual_ctlplanes_nodes = [] %}
 {% set virtual_workers_nodes = [] %}
 {% if virtual_ctlplanes %}

plans/kcli_plan_default.yml

@@ -75,6 +75,7 @@ prs: []
 imagecontentsources: []
 fips: false
 cas: []
+dns: false
 nbde: false
 ntp: false
 ntp_server: 0.rhel.pool.ntp.org

scripts/06_dns.sh

@@ -0,0 +1,3 @@
+yum -y install dnsmasq
+cp /root/dnsmasq.conf /etc/dnsmasq.d/custom.conf
+systemctl enable --now dnsmasq

scripts/launch_steps.sh

@@ -56,14 +56,19 @@ echo -e "${blue}************ RUNNING 05_ntp.sh ************${clear}"
 /root/scripts/05_ntp.sh
 {% endif %}
 
+{% if dns %}
+echo -e "${blue}************ RUNNING 06_dns.sh ************${clear}"
+/root/scripts/06_dns.sh
+{% endif %}
+
 {% if deploy_openshift %}
-echo -e "${blue}************ RUNNING 06_deploy_openshift.sh ************${clear}"
+echo -e "${blue}************ RUNNING 07_deploy_openshift.sh ************${clear}"
 export KUBECONFIG=/root/ocp/auth/kubeconfig
-/root/scripts/06_deploy_openshift.sh
+/root/scripts/07_deploy_openshift.sh
 
 {% if nfs %}
-echo -e "${blue}************ RUNNING 07_nfs.sh ************${clear}"
-/root/scripts/07_nfs.sh
+echo -e "${blue}************ RUNNING 08_nfs.sh ************${clear}"
+/root/scripts/08_nfs.sh
 {% endif %}
 
 {% if imageregistry %}
@@ -76,12 +81,12 @@ echo -e "${blue}************ RUNNING 03_disconnected_olm.sh ************${clear}
 /root/scripts/03_disconnected_olm.sh
 {% endif %}
 
-echo -e "${blue}************ RUNNING 08_post_install.sh ************${clear}"
-/root/scripts/08_post_install.sh
+echo -e "${blue}************ RUNNING 09_post_install.sh ************${clear}"
+/root/scripts/09_post_install.sh
 
 {% if apps %}
-echo -e "${blue}************ RUNNING 09_apps.sh ************${clear}"
-/root/scripts/09_apps.sh
+echo -e "${blue}************ RUNNING 10_apps.sh ************${clear}"
+/root/scripts/10_apps.sh
 {% endif %}
 
 touch /root/cluster_ready.txt

ztp/scripts/siteconfig.sample.yml

@@ -34,7 +34,11 @@ spec:
 {% set default_prefix = baremetal_cidr.split('/')[1] %}
 {% set default_gateway = baremetal_cidr|network_ip(1 if lab else -2) %}
 {% set baremetal_gateway = static_baremetal_gateway or default_gateway %}
+{% if dns %}
+{% set baremetal_dns = installer_ip %}
+{% else %}
 {% set baremetal_dns = static_baremetal_dns or baremetal_gateway %}
+{% endif %}
 {% if dualstack|default(False) %}
 {% set machine_cidrs = machine_cidr_ipv4 + machine_cidr_ipv6 %}
 {% set cluster_networks = [cluster_network_ipv4] + [cluster_network_ipv6] %}